swung0x48/MobileGL
1
0
Fork 0
mirror of https://github.com/MobileGL-Dev/MobileGL synced 2026-09-12 06:08:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] (MG_State/Texture): correctly maintain mag filter compare mode

Browse Source
This commit is contained in:
swung0x48
2025-07-07 10:05:19 +08:00
parent 9e3a5aefad
commit 992ea967a7
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MG/MG_GL/Implementations/GL/Texture/GL_Texture.cpp
+22 -9
View File
@@ -97,16 +97,29 @@ namespace MG_GL::GL {
} }
} }
void FillFilterTypeFromGLEnum(GLenum pname, GLenum param, Diligent::FILTER_TYPE& filter, Diligent::FILTER_TYPE& mipFilter) { void FillFilterTypeFromGLEnum(GLenum pname, GLenum param, Diligent::FILTER_TYPE& minFilter, Diligent::FILTER_TYPE& magFilter, Diligent::FILTER_TYPE& mipFilter) {
if (pname == GL_TEXTURE_COMPARE_MODE) { if (pname == GL_TEXTURE_COMPARE_MODE) {
bool compare = (param == GL_COMPARE_REF_TO_TEXTURE); bool compare = (param == GL_COMPARE_REF_TO_TEXTURE);
filter = ConvertCompareFilter(filter, compare); minFilter = ConvertCompareFilter(minFilter, compare);
magFilter = ConvertCompareFilter(magFilter, compare);
mipFilter = ConvertCompareFilter(mipFilter, compare); mipFilter = ConvertCompareFilter(mipFilter, compare);
return; return;
} }
Diligent::FILTER_TYPE* pFilter = nullptr;
if (pname == GL_TEXTURE_MIN_FILTER) {
pFilter = &minFilter;
} else if (pname == GL_TEXTURE_MAG_FILTER) {
pFilter = &magFilter;
} else {
MG_Util::Debug::LogD("FillFilterTypeFromGLEnum: not allowed pname!");
return;
}
Diligent::FILTER_TYPE& filter = *pFilter;
bool filterIsCompare = IsCompareFilter(filter); bool filterIsCompare = IsCompareFilter(filter);
bool mipFilterIsCompare = IsCompareFilter(filter); bool mipFilterIsCompare = IsCompareFilter(mipFilter);
switch (param) { switch (param) {
case GL_NEAREST: case GL_NEAREST:
@@ -459,10 +472,10 @@ namespace MG_GL::GL {
switch (pname) { switch (pname) {
case GL_TEXTURE_MIN_FILTER: case GL_TEXTURE_MIN_FILTER:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
case GL_TEXTURE_MAG_FILTER: case GL_TEXTURE_MAG_FILTER:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MagFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
case GL_TEXTURE_WRAP_S: case GL_TEXTURE_WRAP_S:
SamDesc.AddressU = ConvertAddressMode(param); SamDesc.AddressU = ConvertAddressMode(param);
@@ -483,7 +496,7 @@ namespace MG_GL::GL {
SamDesc.ComparisonFunc = ConvertComparsionFunc(param); SamDesc.ComparisonFunc = ConvertComparsionFunc(param);
break; break;
case GL_TEXTURE_COMPARE_MODE: case GL_TEXTURE_COMPARE_MODE:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
default: default:
MG_Util::Debug::LogE("%s: not handled pname: %s", __func__, MG_Util::Debug::GLEnumToString(pname)); MG_Util::Debug::LogE("%s: not handled pname: %s", __func__, MG_Util::Debug::GLEnumToString(pname));
@@ -538,10 +551,10 @@ namespace MG_GL::GL {
switch (pname) { switch (pname) {
case GL_TEXTURE_MIN_FILTER: case GL_TEXTURE_MIN_FILTER:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
case GL_TEXTURE_MAG_FILTER: case GL_TEXTURE_MAG_FILTER:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MagFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MagFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
case GL_TEXTURE_WRAP_S: case GL_TEXTURE_WRAP_S:
SamDesc.AddressU = ConvertAddressMode(param); SamDesc.AddressU = ConvertAddressMode(param);
@@ -562,7 +575,7 @@ namespace MG_GL::GL {
SamDesc.ComparisonFunc = ConvertComparsionFunc(param); SamDesc.ComparisonFunc = ConvertComparsionFunc(param);
break; break;
case GL_TEXTURE_COMPARE_MODE: case GL_TEXTURE_COMPARE_MODE:
FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MipFilter); FillFilterTypeFromGLEnum(pname, param, SamDesc.MinFilter, SamDesc.MagFilter, SamDesc.MipFilter);
break; break;
default: default:
MG_Util::Debug::LogE("%s: not handled pname: %s", __func__, MG_Util::Debug::GLEnumToString(pname)); MG_Util::Debug::LogE("%s: not handled pname: %s", __func__, MG_Util::Debug::GLEnumToString(pname));