From a6ffb24f30092281b5e279008d7f14318370479d Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Wed, 5 Nov 2025 16:18:35 +0800 Subject: [PATCH] [Fix] (MG_State/Program): fix ubo name mistaken for uniform name --- MobileGL/MG_Impl/GLImpl/Program/GL_Program.cpp | 5 ++++- MobileGL/MG_State/GLState/ProgramState/ProgramObject.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/MobileGL/MG_Impl/GLImpl/Program/GL_Program.cpp b/MobileGL/MG_Impl/GLImpl/Program/GL_Program.cpp index 3d07d90b..8031d294 100644 --- a/MobileGL/MG_Impl/GLImpl/Program/GL_Program.cpp +++ b/MobileGL/MG_Impl/GLImpl/Program/GL_Program.cpp @@ -362,7 +362,9 @@ namespace MobileGL { GLint GetUniformLocation_State(GLuint program, const GLchar* name) { auto programObject = TryToGetProgramObject(program); if (!programObject) return -1; - return programObject->GetUniformLocation(name); + auto loc = programObject->GetUniformLocation(name); + MGLOG_D("%s: loc %02d = %s", __func__, loc, name); + return loc; } void GetUniform_State(GLuint program, GLint location, void* params) { @@ -821,6 +823,7 @@ namespace MobileGL { } const auto& name = programObject->GetUniformBlockName(uniformBlockIndex); CopyStr(bufSize, length, uniformBlockName, name.c_str(), name.length()); + MGLOG_D("%s: \"%s\" at uniformBlockIndex %02d, length = %d", __func__, uniformBlockName, uniformBlockIndex, *length); } void ValidateProgram_State(GLuint program) { diff --git a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h index 53ee722e..e1291d34 100644 --- a/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h +++ b/MobileGL/MG_State/GLState/ProgramState/ProgramObject.h @@ -94,7 +94,7 @@ namespace MobileGL { const String& GetUniformBlockName(Uint index) const { - auto& ubo = m_program->getUniform(index); + auto& ubo = m_program->getUniformBlock(index); return ubo.name; }