From ea9fc4dbe8328fb44c9af3b6b290151514332d2b Mon Sep 17 00:00:00 2001 From: BZLZHH Date: Mon, 27 Oct 2025 11:59:00 +0800 Subject: [PATCH] [Improvement] (MG_Backend/DirectGLES): Remove unused code. --- MobileGL/MG_Backend/DirectGLES/Managers.cpp | 63 +------------------- MobileGL/MG_Backend/DirectGLES/Managers.h | 16 +---- MobileGL/MG_Backend/DirectGLES/Utils.cpp | 4 +- MobileGL/MG_Backend/DirectGLES/Utils.h | 3 +- MobileGL/MG_Impl/GLImpl/Drawing/GL_Drawing.h | 6 +- scripts/format_code.sh | 0 6 files changed, 8 insertions(+), 84 deletions(-) mode change 100644 => 100755 scripts/format_code.sh diff --git a/MobileGL/MG_Backend/DirectGLES/Managers.cpp b/MobileGL/MG_Backend/DirectGLES/Managers.cpp index c65241b7..a9f97008 100644 --- a/MobileGL/MG_Backend/DirectGLES/Managers.cpp +++ b/MobileGL/MG_Backend/DirectGLES/Managers.cpp @@ -382,70 +382,9 @@ namespace MobileGL::MG_Backend::DirectGLES { } // namespace FramebufferImpl namespace PrgramImpl { - UnorderedMap, SharedPtr> - g_backendShaderObjects; UnorderedMap, SharedPtr> g_backendProgramObjects; - BackendShaderObjectImpl::BackendShaderObjectImpl() { - m_backendShaderId = MG_External::GLES::glCreateShader(GL_VERTEX_SHADER); - if (m_backendShaderId == 0) { - MGLOG_E("Failed to create shader object in backend."); - } else { - MGLOG_D("Created backend shader object with ID: %u", m_backendShaderId); - } - } - - BackendShaderObjectImpl::~BackendShaderObjectImpl() { - if (m_backendShaderId != 0) { - MGLOG_D("Deleting backend shader object with ID: %u", m_backendShaderId); - MG_External::GLES::glDeleteShader(m_backendShaderId); - } - } - - void BackendShaderObjectImpl::SyncToBackend(SharedPtr& stateShaderObject) { - if (!stateShaderObject) { - MGLOG_E("State shader object is null, skipping backend sync."); - return; - } - - if (!stateShaderObject->GetCompileStatus()) { - MGLOG_E("Shader object is not compiled, skipping backend sync. Shader: 0x%p", stateShaderObject.get()); - return; - } - - MGLOG_D("Syncing shader to backend. State shader: 0x%p, Backend ID: %u, Stage: %s", stateShaderObject.get(), - m_backendShaderId, - MG_Util::ConvertGLEnumToString( - MG_State::GLState::ConvertGLShaderTypeByMGLShaderStage(stateShaderObject->GetShaderStage())) - .c_str()); - - auto shaderTShader = stateShaderObject->GetCompiledShader(); - String source = ConvertTShaderToGLSL(shaderTShader, 320, true); // TODO: get real version - const char* sourceCStr = source.c_str(); - - MGLOG_D("Setting shader source for backend shader ID: %u", m_backendShaderId); - MG_External::GLES::glShaderSource(m_backendShaderId, 1, &sourceCStr, nullptr); - - MGLOG_D("Compiling shader. Backend ID: %u", m_backendShaderId); - MG_External::GLES::glCompileShader(m_backendShaderId); - - GLint compileStatus; - MG_External::GLES::glGetShaderiv(m_backendShaderId, GL_COMPILE_STATUS, &compileStatus); - if (compileStatus != GL_TRUE) { - GLint logLength; - MG_External::GLES::glGetShaderiv(m_backendShaderId, GL_INFO_LOG_LENGTH, &logLength); - Vector log(logLength); - MG_External::GLES::glGetShaderInfoLog(m_backendShaderId, logLength, nullptr, log.data()); - MGLOG_E("Shader compilation failed for backend ID %u: %s", m_backendShaderId, log.data()); - } else { - MGLOG_D("Shader compiled successfully. Backend ID: %u", m_backendShaderId); - } - - m_isInitialized = true; - MGLOG_D("Shader sync completed. Backend ID: %u", m_backendShaderId); - } - BackendProgramObjectImpl::BackendProgramObjectImpl() { m_backendProgramId = MG_External::GLES::glCreateProgram(); if (m_backendProgramId == 0) { @@ -596,4 +535,4 @@ namespace MobileGL::MG_Backend::DirectGLES { } // namespace PrgramImpl namespace Utils {} // namespace Utils -} // namespace MobileGL::MG_Backend::DirectGLES \ No newline at end of file +} // namespace MobileGL::MG_Backend::DirectGLES diff --git a/MobileGL/MG_Backend/DirectGLES/Managers.h b/MobileGL/MG_Backend/DirectGLES/Managers.h index 57601437..6540d5aa 100644 --- a/MobileGL/MG_Backend/DirectGLES/Managers.h +++ b/MobileGL/MG_Backend/DirectGLES/Managers.h @@ -96,18 +96,6 @@ namespace MobileGL::MG_Backend::DirectGLES { } // namespace FramebufferImpl namespace PrgramImpl { - class BackendShaderObjectImpl { - public: - BackendShaderObjectImpl(); - ~BackendShaderObjectImpl(); - void SyncToBackend(SharedPtr& stateShaderObject); - Uint GetBackendShaderId() const { return m_backendShaderId; } - - private: - Uint m_backendShaderId = 0; - Bool m_isInitialized = false; - }; - class BackendProgramObjectImpl { public: BackendProgramObjectImpl(); @@ -123,9 +111,7 @@ namespace MobileGL::MG_Backend::DirectGLES { Bool m_isInitialized = false; }; - extern UnorderedMap, SharedPtr> - g_backendShaderObjects; extern UnorderedMap, SharedPtr> g_backendProgramObjects; } // namespace PrgramImpl -} // namespace MobileGL::MG_Backend::DirectGLES \ No newline at end of file +} // namespace MobileGL::MG_Backend::DirectGLES diff --git a/MobileGL/MG_Backend/DirectGLES/Utils.cpp b/MobileGL/MG_Backend/DirectGLES/Utils.cpp index 09c3c40f..7c515e81 100644 --- a/MobileGL/MG_Backend/DirectGLES/Utils.cpp +++ b/MobileGL/MG_Backend/DirectGLES/Utils.cpp @@ -294,8 +294,6 @@ namespace MobileGL::MG_Backend::DirectGLES { } // namespace FramebufferImpl namespace PrgramImpl { - String ConvertTShaderToGLSL(SharedPtr& shaderTShader, Uint glslVersion, Bool isES) {} - String ProcessOutColorLocations(const String& glslCode) { const static std::regex pattern(R"(\n(out highp vec4 outColor)(\d+);)"); const String replacement = "\nlayout(location=$2) $1$2;"; @@ -471,4 +469,4 @@ namespace MobileGL::MG_Backend::DirectGLES { } } } // namespace Utils -} // namespace MobileGL::MG_Backend::DirectGLES \ No newline at end of file +} // namespace MobileGL::MG_Backend::DirectGLES diff --git a/MobileGL/MG_Backend/DirectGLES/Utils.h b/MobileGL/MG_Backend/DirectGLES/Utils.h index 22c50e21..499f226e 100644 --- a/MobileGL/MG_Backend/DirectGLES/Utils.h +++ b/MobileGL/MG_Backend/DirectGLES/Utils.h @@ -61,7 +61,6 @@ namespace MobileGL::MG_Backend::DirectGLES { } // namespace FramebufferImpl namespace PrgramImpl { - String ConvertTShaderToGLSL(SharedPtr& shaderTShader, Uint glslVersion, Bool isES); String ProcessOutColorLocations(const String& glslCode); String ForceSupporterOutput(const String& glslCode); String RemoveLayoutBinding(const String& glslCode); @@ -71,4 +70,4 @@ namespace MobileGL::MG_Backend::DirectGLES { void CheckGLESError(); GLenum GetBindingQuery(GLenum target, bool isTexture); } // namespace Utils -} // namespace MobileGL::MG_Backend::DirectGLES \ No newline at end of file +} // namespace MobileGL::MG_Backend::DirectGLES diff --git a/MobileGL/MG_Impl/GLImpl/Drawing/GL_Drawing.h b/MobileGL/MG_Impl/GLImpl/Drawing/GL_Drawing.h index 20fbbeff..aaa10291 100644 --- a/MobileGL/MG_Impl/GLImpl/Drawing/GL_Drawing.h +++ b/MobileGL/MG_Impl/GLImpl/Drawing/GL_Drawing.h @@ -4,8 +4,10 @@ namespace MobileGL { namespace MG_Impl::GLImpl { /* @INSERTION_POINT:FUNCTION_DECLARATION@ */ - void MultiDrawElements(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, GLsizei drawcount); - void MultiDrawElementsBaseVertex(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, GLsizei drawcount, const GLint* basevertex); + void MultiDrawElements(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, + GLsizei drawcount); + void MultiDrawElementsBaseVertex(GLenum mode, const GLsizei* count, GLenum type, const void* const* indices, + GLsizei drawcount, const GLint* basevertex); void Clear(GLbitfield mask); void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices); } // namespace MG_Impl::GLImpl diff --git a/scripts/format_code.sh b/scripts/format_code.sh old mode 100644 new mode 100755