diff options
| author | Scott Mansell <phiren@gmail.com> | 2016-08-20 08:48:28 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 08:48:28 +1200 |
| commit | f1964f90d647251b677b3de29d08c4c22ea5344a (patch) | |
| tree | 80391f2503fcd95627abecb4c36d91c6e6a0c1d1 /Source/Core | |
| parent | 31c530c7b3043a0673d8ec8694169d1accbb732f (diff) | |
| parent | da0204a85c9227c9504823abaf096544b57b0577 (diff) | |
Merge pull request #4129 from RisingFog/hahahahahahahahahaha
Fix a really stupid GLSL version parsing bug
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 18 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.h | 1 |
2 files changed, 8 insertions, 11 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index d637c308ca..69f06c6b52 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -352,7 +352,6 @@ Renderer::Renderer() g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR); g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER); g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION); - g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION); InitDriverInfo(); @@ -527,13 +526,13 @@ Renderer::Renderer() // depth clamping. g_Config.backend_info.bSupportsDepthClamp = false; - if (strstr(g_ogl_config.glsl_version, "3.0")) + if (GLExtensions::Version() == 300) { g_ogl_config.eSupportedGLSLVersion = GLSLES_300; g_ogl_config.bSupportsAEP = false; g_Config.backend_info.bSupportsGeometryShaders = false; } - else if (strstr(g_ogl_config.glsl_version, "3.1")) + else if (GLExtensions::Version() == 310) { g_ogl_config.eSupportedGLSLVersion = GLSLES_310; g_ogl_config.bSupportsAEP = GLExtensions::Supports("GL_ANDROID_extension_pack_es31a"); @@ -575,16 +574,15 @@ Renderer::Renderer() } else { - if (strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10") || - strstr(g_ogl_config.glsl_version, "1.20")) + if (GLExtensions::Version() < 300) { PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n" "GPU: Does your video card support OpenGL 3.0?\n" "GPU: Your driver supports GLSL %s", - g_ogl_config.glsl_version); + (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION)); bSuccess = false; } - else if (strstr(g_ogl_config.glsl_version, "1.30")) + else if (GLExtensions::Version() == 300) { g_ogl_config.eSupportedGLSLVersion = GLSL_130; g_ogl_config.bSupportsEarlyFragmentTests = @@ -594,7 +592,7 @@ Renderer::Renderer() g_Config.backend_info.bSupportsGeometryShaders = false; // geometry shaders are only supported on glsl150+ } - else if (strstr(g_ogl_config.glsl_version, "1.40")) + else if (GLExtensions::Version() == 310) { g_ogl_config.eSupportedGLSLVersion = GLSL_140; g_ogl_config.bSupportsEarlyFragmentTests = @@ -604,11 +602,11 @@ Renderer::Renderer() g_Config.backend_info.bSupportsGeometryShaders = false; // geometry shaders are only supported on glsl150+ } - else if (strstr(g_ogl_config.glsl_version, "1.50")) + else if (GLExtensions::Version() == 320) { g_ogl_config.eSupportedGLSLVersion = GLSL_150; } - else if (strstr(g_ogl_config.glsl_version, "3.30")) + else if (GLExtensions::Version() == 330) { g_ogl_config.eSupportedGLSLVersion = GLSL_330; } diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index efcc4e81b9..c240a936d3 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -55,7 +55,6 @@ struct VideoConfig const char* gl_vendor; const char* gl_renderer; const char* gl_version; - const char* glsl_version; s32 max_samples; }; |