From 6293f3f0ab8143ac38777443a047b1fe580d2eb8 Mon Sep 17 00:00:00 2001 From: BZLZHH Date: Sun, 30 Nov 2025 11:42:20 +0800 Subject: [PATCH] [Feat] (MG_State/TextureState): Add GL_FLOAT_32_UNSIGNED_INT_24_8_REV. --- MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp | 4 ++-- MobileGL/MG_State/GLState/TextureState/TextureEnum.h | 7 ++++--- .../MG_Util/Converters/GLToMG/TextureEnumConverter.cpp | 4 +++- .../MG_Util/Converters/MGToGL/TextureEnumConverter.cpp | 4 +++- .../MG_Util/Converters/MGToStr/TextureEnumConverter.cpp | 4 +++- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp index 15e47d77..811c4fc5 100644 --- a/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp +++ b/MobileGL/MG_Impl/GLImpl/Texture/GL_Texture.cpp @@ -317,7 +317,7 @@ namespace MobileGL { GLint border, GLenum format, GLenum type, const void* pixels) { MGLOG_D( "TexImage2D_State called with target: %s, level: %d, internalformat: %s, width: %d, height: %d, " - "border: %d, format: %s, type: %s, pixels: %p", + "border: %d, format: %s, type: %s (%u), pixels: %p", MG_Util::ConvertTextureUploadTargetToString(MG_Util::ConvertGLEnumToTextureUploadTarget(target)) .c_str(), level, @@ -327,7 +327,7 @@ namespace MobileGL { width, height, border, MG_Util::ConvertTextureInputFormatToString(MG_Util::ConvertGLEnumToTextureInputFormat(format)).c_str(), MG_Util::ConvertTexturePixelDataTypeToString(MG_Util::ConvertGLEnumToTexturePixelDataType(type)) - .c_str(), + .c_str(),type, pixels); // ======================= Converting ================================ TextureUploadTarget textureUploadingTarget = MG_Util::ConvertGLEnumToTextureUploadTarget(target); diff --git a/MobileGL/MG_State/GLState/TextureState/TextureEnum.h b/MobileGL/MG_State/GLState/TextureState/TextureEnum.h index d1d5a8bb..13e0f11d 100644 --- a/MobileGL/MG_State/GLState/TextureState/TextureEnum.h +++ b/MobileGL/MG_State/GLState/TextureState/TextureEnum.h @@ -170,8 +170,9 @@ namespace MobileGL { UnsignedInt8888Rev, UnsignedInt1010102, UnsignedInt2101010Rev, - UnsignedInt101111Rev, // not a standard type in OpenGL core profile - UnsignedInt5999Rev, // not a standard type in OpenGL core profile + UnsignedInt101111Rev, + UnsignedInt5999Rev, + Float32UnsignedInt248Rev, TypeCount, Unknown = -1 @@ -188,4 +189,4 @@ namespace MobileGL { SwizzleParamCount, Unknown = -1 }; -} // namespace MobileGL \ No newline at end of file +} // namespace MobileGL diff --git a/MobileGL/MG_Util/Converters/GLToMG/TextureEnumConverter.cpp b/MobileGL/MG_Util/Converters/GLToMG/TextureEnumConverter.cpp index 36bf9b25..c4f41ad6 100644 --- a/MobileGL/MG_Util/Converters/GLToMG/TextureEnumConverter.cpp +++ b/MobileGL/MG_Util/Converters/GLToMG/TextureEnumConverter.cpp @@ -272,6 +272,8 @@ namespace MobileGL { return TexturePixelDataType::UnsignedInt2101010Rev; case GL_UNSIGNED_INT_5_9_9_9_REV: return TexturePixelDataType::UnsignedInt5999Rev; + case GL_FLOAT_32_UNSIGNED_INT_24_8_REV: + return TexturePixelDataType::Float32UnsignedInt248Rev; default: return TexturePixelDataType::Unknown; } @@ -447,4 +449,4 @@ namespace MobileGL { } } } // namespace MG_Util -} // namespace MobileGL \ No newline at end of file +} // namespace MobileGL diff --git a/MobileGL/MG_Util/Converters/MGToGL/TextureEnumConverter.cpp b/MobileGL/MG_Util/Converters/MGToGL/TextureEnumConverter.cpp index 84651976..a92fb63a 100644 --- a/MobileGL/MG_Util/Converters/MGToGL/TextureEnumConverter.cpp +++ b/MobileGL/MG_Util/Converters/MGToGL/TextureEnumConverter.cpp @@ -265,6 +265,8 @@ namespace MobileGL { return GL_UNSIGNED_INT_10F_11F_11F_REV; case TexturePixelDataType::UnsignedInt5999Rev: return GL_UNSIGNED_INT_5_9_9_9_REV; + case TexturePixelDataType::Float32UnsignedInt248Rev: + return GL_FLOAT_32_UNSIGNED_INT_24_8_REV; default: return GL_UNKNOWN_MGL; } @@ -441,4 +443,4 @@ namespace MobileGL { } } } // namespace MG_Util -} // namespace MobileGL \ No newline at end of file +} // namespace MobileGL diff --git a/MobileGL/MG_Util/Converters/MGToStr/TextureEnumConverter.cpp b/MobileGL/MG_Util/Converters/MGToStr/TextureEnumConverter.cpp index 4d343618..c10b66f7 100644 --- a/MobileGL/MG_Util/Converters/MGToStr/TextureEnumConverter.cpp +++ b/MobileGL/MG_Util/Converters/MGToStr/TextureEnumConverter.cpp @@ -267,6 +267,8 @@ namespace MobileGL { return "UnsignedInt101111Rev"; case TexturePixelDataType::UnsignedInt5999Rev: return "UnsignedInt5999Rev"; + case TexturePixelDataType::Float32UnsignedInt248Rev: + return "Float32UnsignedInt248Rev"; default: return "Unknown"; } @@ -400,4 +402,4 @@ namespace MobileGL { } } } // namespace MG_Util -} // namespace MobileGL \ No newline at end of file +} // namespace MobileGL