diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-27 05:48:36 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-27 05:48:36 (GMT) |
| commit | 1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c (patch) | |
| tree | dd974c2c48ad0e69a13d3f60caa213510e32e72f | |
| parent | 3c2dc7f652996d1f3b504b42d872734df2e9234f (diff) | |
| download | Qt-1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c.zip Qt-1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c.tar.gz Qt-1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c.tar.bz2 | |
Recognize GL_ARB_shader_objects as indicating shaders
Fixes a regression introduced by bf5c25c4. Some OpenGL
implementations don't have the GL_ARB_fragment_shader extension
listed even though they do support shaders.
Task-number: QTBUG-13179
Reviewed-by: Sarah Smith
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 81e55b3..f3d0d81 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4931,6 +4931,8 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FragmentProgram; if (extensions.match("GL_ARB_fragment_shader")) glExtensions |= FragmentShader; + if (extensions.match("GL_ARB_shader_objects")) + glExtensions |= FragmentShader; if (extensions.match("GL_ARB_ES2_compatibility")) glExtensions |= ES2Compatibility; if (extensions.match("GL_ARB_texture_mirrored_repeat")) |