From 36ff345e6038afbaecd59c96e85d7a5ac2839ae3 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 9 Mar 2021 17:25:49 +1000 Subject: [PATCH] Revert "GL/Context: Disable GLES3.2 on PowerVR Rogue" Broken driver is just broken. Not much I can do when I don't have one of these phones and the shader compiler simply says "failure" without any line information. --- src/common/gl/context.cpp | 6 ------ src/core/shadergen.cpp | 5 ----- 2 files changed, 11 deletions(-) diff --git a/src/common/gl/context.cpp b/src/common/gl/context.cpp index 518322309..7c4e94734 100644 --- a/src/common/gl/context.cpp +++ b/src/common/gl/context.cpp @@ -64,12 +64,6 @@ static void DisableBrokenExtensions(const char* gl_vendor, const char* gl_render GLAD_GL_EXT_copy_image = 0; GLAD_GL_OES_copy_image = 0; } - - if (std::strstr(gl_renderer, "PowerVR Rogue")) - { - Log_VerbosePrintf("PowerVR Rogue driver detected, disabling GLES3.2"); - GLAD_GL_ES_VERSION_3_2 = 0; - } } Context::Context(const WindowInfo& wi) : m_wi(wi) {} diff --git a/src/core/shadergen.cpp b/src/core/shadergen.cpp index 295efd1e0..3e4589ce9 100644 --- a/src/core/shadergen.cpp +++ b/src/core/shadergen.cpp @@ -36,7 +36,6 @@ void ShaderGen::DefineMacro(std::stringstream& ss, const char* name, bool enable void ShaderGen::SetGLSLVersionString() { const char* glsl_version = reinterpret_cast(glGetString(GL_SHADING_LANGUAGE_VERSION)); - const char* gl_renderer = reinterpret_cast(glGetString(GL_RENDERER)); const bool glsl_es = (m_render_api == HostDisplay::RenderAPI::OpenGLES); Assert(glsl_version != nullptr); @@ -59,10 +58,6 @@ void ShaderGen::SetGLSLVersionString() major_version = 3; minor_version = 20; } - - // Special cases - PowerVR's GLES 3.2 driver seems to choke on our shaders. - if (glsl_es && std::strstr(gl_renderer, "PowerVR Rogue") && major_version >= 3) - minor_version = std::min(minor_version, 10); } else {