From fa6ace095534314b8779a594907dc8d1276f9035 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Wed, 25 Jun 2025 23:49:43 +0800 Subject: [PATCH] [Misc]: minor fixes --- MG/MG_GL/Implementations/GL/Common/GL_Common.cpp | 2 +- MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp | 4 ---- MG/MG_UTIL/Program/DebugTool.cpp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/MG/MG_GL/Implementations/GL/Common/GL_Common.cpp b/MG/MG_GL/Implementations/GL/Common/GL_Common.cpp index 355a1882..8607da02 100644 --- a/MG/MG_GL/Implementations/GL/Common/GL_Common.cpp +++ b/MG/MG_GL/Implementations/GL/Common/GL_Common.cpp @@ -198,7 +198,7 @@ namespace MG_GL::GL { } void PixelStorei(GLenum pname, GLint param) { - MG_Util::Debug::LogD("glPixelStorei, pname: %d, param: %d", pname, param); + MG_Util::Debug::LogD("glPixelStorei, pname: %s, param: %d", MG_Util::Debug::GLEnumToString(pname), param); GLenum result = MG_State::SetPixelStoreInt(pname,param); if (result == GL_NO_ERROR) { MG_Diligent::g_PSOManager.MarkPSODirty(MG_State_T::programState->currentProgram_); diff --git a/MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp b/MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp index 3239c753..ccc95643 100644 --- a/MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp +++ b/MG/MG_GL/Implementations/GL/Drawing/GL_Drawing.cpp @@ -430,7 +430,6 @@ namespace MG_GL::GL { auto& programInfo = MG_Diligent::g_ProgramMap[program]; GLuint drawFB = MG_State_T::framebufferState->currentBindings_[GL_DRAW_FRAMEBUFFER]; - if (drawFB == 0) drawFB = 0; auto itFB = MG_Diligent::g_FramebufferMap.find(drawFB); if (itFB == MG_Diligent::g_FramebufferMap.end()) { @@ -474,8 +473,6 @@ namespace MG_GL::GL { return; } - std::unordered_map createdBuffers; - // for (const auto& [attribIndex, attrib] : pVAO->attribs) { for (uint32_t attribIndex = 0; attribIndex < MG_Constants::VertexArray::MAX_VERTEX_ATTRIBS; ++attribIndex) { const auto& attrib = pVAO->attribs[attribIndex]; @@ -562,7 +559,6 @@ namespace MG_GL::GL { MG_Diligent::g_pContext->UnmapBuffer(pBuffer, Diligent::MAP_WRITE); bufferObj.dirty = false; MG_Util::Debug::LogD("Successfully updated data for dynamic buffer %u.", bufferID); - createdBuffers[bufferID] = pBuffer; } else { MG_Util::Debug::LogE("Failed to map dynamic buffer %u for data update.", bufferID); } diff --git a/MG/MG_UTIL/Program/DebugTool.cpp b/MG/MG_UTIL/Program/DebugTool.cpp index 2b45ce05..67f765ca 100644 --- a/MG/MG_UTIL/Program/DebugTool.cpp +++ b/MG/MG_UTIL/Program/DebugTool.cpp @@ -116,7 +116,7 @@ namespace MG_Util::Program { } void DumpUniforms(const ProgramState& state, GLuint program) { - if (MG_Global::Common::LogLevel > MG_Constants::Common::LOG_LEVEL_DEBUG) + if constexpr (MG_Global::Common::LogLevel > MG_Constants::Common::LOG_LEVEL_DEBUG) return; auto* prog = state.GetProgramObject(program);