ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a really stupid GLSL version parsing bug

This commit is contained in:
Chris Burgener 2016-08-17 19:20:24 -04:00
parent 40f4308dc2
commit da0204a85c
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -352,7 +352,6 @@ Renderer::Renderer()
g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR); g_ogl_config.gl_vendor = (const char*)glGetString(GL_VENDOR);
g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER); g_ogl_config.gl_renderer = (const char*)glGetString(GL_RENDERER);
g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION); g_ogl_config.gl_version = (const char*)glGetString(GL_VERSION);
g_ogl_config.glsl_version = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
InitDriverInfo(); InitDriverInfo();
@ -527,13 +526,13 @@ Renderer::Renderer()
// depth clamping. // depth clamping.
g_Config.backend_info.bSupportsDepthClamp = false; 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.eSupportedGLSLVersion = GLSLES_300;
g_ogl_config.bSupportsAEP = false; g_ogl_config.bSupportsAEP = false;
g_Config.backend_info.bSupportsGeometryShaders = 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.eSupportedGLSLVersion = GLSLES_310;
g_ogl_config.bSupportsAEP = GLExtensions::Supports("GL_ANDROID_extension_pack_es31a"); g_ogl_config.bSupportsAEP = GLExtensions::Supports("GL_ANDROID_extension_pack_es31a");
@ -575,16 +574,15 @@ Renderer::Renderer()
} }
else else
{ {
if (strstr(g_ogl_config.glsl_version, "1.00") || strstr(g_ogl_config.glsl_version, "1.10") || if (GLExtensions::Version() < 300)
strstr(g_ogl_config.glsl_version, "1.20"))
{ {
PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n" PanicAlert("GPU: OGL ERROR: Need at least GLSL 1.30\n"
"GPU: Does your video card support OpenGL 3.0?\n" "GPU: Does your video card support OpenGL 3.0?\n"
"GPU: Your driver supports GLSL %s", "GPU: Your driver supports GLSL %s",
g_ogl_config.glsl_version); (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION));
bSuccess = false; 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.eSupportedGLSLVersion = GLSL_130;
g_ogl_config.bSupportsEarlyFragmentTests = g_ogl_config.bSupportsEarlyFragmentTests =
@ -594,7 +592,7 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsGeometryShaders = g_Config.backend_info.bSupportsGeometryShaders =
false; // geometry shaders are only supported on glsl150+ 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.eSupportedGLSLVersion = GLSL_140;
g_ogl_config.bSupportsEarlyFragmentTests = g_ogl_config.bSupportsEarlyFragmentTests =
@ -604,11 +602,11 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsGeometryShaders = g_Config.backend_info.bSupportsGeometryShaders =
false; // geometry shaders are only supported on glsl150+ 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; 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; g_ogl_config.eSupportedGLSLVersion = GLSL_330;
} }

1
Source/Core/VideoBackends/OGL/Render.h
View File

@ -55,7 +55,6 @@ struct VideoConfig
const char* gl_vendor; const char* gl_vendor;
const char* gl_renderer; const char* gl_renderer;
const char* gl_version; const char* gl_version;
const char* glsl_version;
s32 max_samples; s32 max_samples;
}; };