From 824db45311b08abdc673e609d50f106933cf948f Mon Sep 17 00:00:00 2001 From: renderexpert Date: Fri, 24 Jan 2025 14:30:29 +0000 Subject: [PATCH] Remove Tegra support hacks Signed-off-by: renderexpert --- drape/gl_gpu_program.cpp | 16 ++-------------- drape/support_manager.cpp | 4 ---- drape/support_manager.hpp | 2 -- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drape/gl_gpu_program.cpp b/drape/gl_gpu_program.cpp index 3a3bfedbcf..04471969fd 100644 --- a/drape/gl_gpu_program.cpp +++ b/drape/gl_gpu_program.cpp @@ -23,26 +23,14 @@ GLGpuProgram::GLGpuProgram(std::string const & programName, if (!GLFunctions::glLinkProgram(m_programID, errorLog)) LOG(LERROR, ("Program ", programName, " link error = ", errorLog)); - // On Tegra3 glGetActiveUniform isn't work if you detach shaders after linking. LoadUniformLocations(); - // On Tegra2 we cannot detach shaders at all. - // https://devtalk.nvidia.com/default/topic/528941/alpha-blending-not-working-on-t20-and-t30-under-ice-cream-sandwich/ - if (!SupportManager::Instance().IsTegraDevice()) - { - GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID()); - GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID()); - } + GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID()); + GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID()); } GLGpuProgram::~GLGpuProgram() { - if (SupportManager::Instance().IsTegraDevice()) - { - GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID()); - GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID()); - } - GLFunctions::glDeleteProgram(m_programID); } diff --git a/drape/support_manager.cpp b/drape/support_manager.cpp index cc71c30010..3b213636ea 100644 --- a/drape/support_manager.cpp +++ b/drape/support_manager.cpp @@ -32,10 +32,6 @@ void SupportManager::Init(ref_ptr context) m_rendererVersion = context->GetRendererVersion(); LOG(LINFO, ("Renderer =", m_rendererName, "| Api =", context->GetApiVersion(), "| Version =", m_rendererVersion)); - m_isTegra = (m_rendererName.find("Tegra") != std::string::npos); - if (m_isTegra) - LOG(LINFO, ("NVidia Tegra device detected.")); - auto const apiVersion = context->GetApiVersion(); if (apiVersion == dp::ApiVersion::OpenGLES3) { diff --git a/drape/support_manager.hpp b/drape/support_manager.hpp index e2e8e09aa0..f84c085b1c 100644 --- a/drape/support_manager.hpp +++ b/drape/support_manager.hpp @@ -26,7 +26,6 @@ public: // reinitialization. void Init(ref_ptr context); - bool IsTegraDevice() const { return m_isTegra; } bool IsAntialiasingEnabledByDefault() const { return m_isAntialiasingEnabledByDefault; } float GetMaxLineWidth() const { return m_maxLineWidth; } @@ -48,7 +47,6 @@ private: std::string m_rendererName; std::string m_rendererVersion; - bool m_isTegra = false; bool m_isAntialiasingEnabledByDefault = false; float m_maxLineWidth = 1;