diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 07:53:51 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 07:53:51 +0200 |
| commit | 46194955b223b65b08c300325d6de0620817aa04 (patch) | |
| tree | dd974c2c48ad0e69a13d3f60caa213510e32e72f | |
| parent | e5aa5a9d7e97b975316b8cc18554743cccf06474 (diff) | |
| parent | 1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c (diff) | |
| download | qt4-tools-46194955b223b65b08c300325d6de0620817aa04.tar.gz | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Recognize GL_ARB_shader_objects as indicating shaders
| -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 81e55b3c47..f3d0d81af4 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")) |