YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed texture filter modes not applying.

Browse Source
This commit is contained in:
Dominic Masters
2023-05-22 11:52:10 -07:00
parent 8328dba55c
commit 66c4755ac5
2 changed files with 74 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn/display/_Texture.hpp
View File

@ -36,12 +36,16 @@ namespace Dawn {
StateProperty<enum TextureWrapMode> wrapModeY; StateProperty<enum TextureWrapMode> wrapModeY;
StateProperty<enum TextureFilterMode> filterModeMin; StateProperty<enum TextureFilterMode> filterModeMin;
StateProperty<enum TextureFilterMode> filterModeMag; StateProperty<enum TextureFilterMode> filterModeMag;
StateProperty<enum TextureFilterMode> mipmapFilterModeMin;
StateProperty<enum TextureFilterMode> mipmapFilterModeMag;
ITexture() : ITexture() :
wrapModeX(TEXTURE_WRAP_MODE_CLAMP_TO_EDGE), wrapModeX(TEXTURE_WRAP_MODE_CLAMP_TO_EDGE),
wrapModeY(TEXTURE_WRAP_MODE_CLAMP_TO_EDGE), wrapModeY(TEXTURE_WRAP_MODE_CLAMP_TO_EDGE),
filterModeMin(TEXTURE_FILTER_MODE_LINEAR), filterModeMin(TEXTURE_FILTER_MODE_LINEAR),
filterModeMag(TEXTURE_FILTER_MODE_LINEAR) filterModeMag(TEXTURE_FILTER_MODE_LINEAR),
mipmapFilterModeMin(TEXTURE_FILTER_MODE_NEAREST),
mipmapFilterModeMag(TEXTURE_FILTER_MODE_NEAREST)
{ {
} }

126
src/dawnopengl/display/Texture.cpp
View File

@ -8,6 +8,13 @@
using namespace Dawn; using namespace Dawn;
Texture::Texture() : ITexture() { Texture::Texture() : ITexture() {
useEffect([&]{
this->texturePropertiesNeedUpdating = true;
}, {
&this->wrapModeX, &this->wrapModeY,
&this->filterModeMin, &this->filterModeMag,
&this->mipmapFilterModeMin, &this->mipmapFilterModeMag
});
} }
void Texture::bind(textureslot_t slot) { void Texture::bind(textureslot_t slot) {
@ -60,77 +67,78 @@ bool_t Texture::isReady() {
} }
void Texture::updateTextureProperties() { void Texture::updateTextureProperties() {
switch(((enum TextureWrapMode)this->wrapModeX)) { auto setWrapMode = [&](GLenum axis, enum TextureWrapMode wm) {
case TEXTURE_WRAP_MODE_REPEAT: switch(wm) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); case TEXTURE_WRAP_MODE_REPEAT:
break; glTexParameteri(GL_TEXTURE_2D, axis, GL_REPEAT);
break;
case TEXTURE_WRAP_MODE_MIRRORED_REPEAT: case TEXTURE_WRAP_MODE_MIRRORED_REPEAT:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT); glTexParameteri(GL_TEXTURE_2D, axis, GL_MIRRORED_REPEAT);
break; break;
case TEXTURE_WRAP_MODE_CLAMP_TO_EDGE: case TEXTURE_WRAP_MODE_CLAMP_TO_EDGE:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, axis, GL_CLAMP_TO_EDGE);
break; break;
case TEXTURE_WRAP_MODE_CLAMP_TO_BORDER: case TEXTURE_WRAP_MODE_CLAMP_TO_BORDER:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, axis, GL_CLAMP_TO_BORDER);
break; break;
default: default:
assertUnreachable(); assertUnreachable();
} }
};
switch(((enum TextureWrapMode)this->wrapModeY)) { setWrapMode(GL_TEXTURE_WRAP_S, this->wrapModeX);
case TEXTURE_WRAP_MODE_REPEAT: setWrapMode(GL_TEXTURE_WRAP_T, this->wrapModeY);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T ,GL_REPEAT);
break;
case TEXTURE_WRAP_MODE_MIRRORED_REPEAT: auto setFilterMode = [&](
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT); GLenum minMag,
break; enum TextureFilterMode filter,
enum TextureFilterMode mapFilterMode
) {
switch(filter) {
case TEXTURE_FILTER_MODE_NEAREST: {
switch(mapFilterMode) {
case TEXTURE_FILTER_MODE_NEAREST:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_NEAREST);
break;
case TEXTURE_WRAP_MODE_CLAMP_TO_EDGE: case TEXTURE_FILTER_MODE_LINEAR:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_NEAREST);
break; break;
case TEXTURE_WRAP_MODE_CLAMP_TO_BORDER: default:
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); assertUnreachable();
break; }
break;
}
default: case TEXTURE_FILTER_MODE_LINEAR: {
assertUnreachable(); switch(mapFilterMode) {
} case TEXTURE_FILTER_MODE_NEAREST:
glTexParameteri(GL_TEXTURE_2D, minMag, GL_NEAREST_MIPMAP_LINEAR);
break;
switch(((enum TextureFilterMode)this->filterModeMin)) { case TEXTURE_FILTER_MODE_LINEAR:
case TEXTURE_FILTER_MODE_NEAREST: glTexParameteri(GL_TEXTURE_2D, minMag, GL_LINEAR_MIPMAP_LINEAR);
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); break;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
break;
case TEXTURE_FILTER_MODE_LINEAR: default:
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); assertUnreachable();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); }
break; break;
}
default: default: {
assertUnreachable(); assertUnreachable();
} }
}
};
switch(((enum TextureFilterMode)this->filterModeMag)) { setFilterMode(GL_TEXTURE_MIN_FILTER, this->filterModeMin, this->mipmapFilterModeMin);
case TEXTURE_FILTER_MODE_NEAREST: setFilterMode(GL_TEXTURE_MAG_FILTER, this->filterModeMag, this->mipmapFilterModeMag);
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
break;
case TEXTURE_FILTER_MODE_LINEAR:
// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
break;
default:
assertUnreachable();
}
} }
void Texture::bufferRaw(void *data) { void Texture::bufferRaw(void *data) {
@ -164,7 +172,7 @@ void Texture::bufferRaw(void *data) {
this->width, this->height, this->width, this->height,
0, format, GL_UNSIGNED_BYTE, data 0, format, GL_UNSIGNED_BYTE, data
); );
// glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
this->texturePropertiesNeedUpdating = true; this->texturePropertiesNeedUpdating = true;
} }