diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-08-26 09:31:27 (GMT) |
| commit | 69354f37173b7bfcf7ea0f37175a34b8766afcbb (patch) | |
| tree | d5d35fbb1c5b93470b6b1aa03c359ac09695055f /src/opengl/qgl.cpp | |
| parent | 065610d14fda00057724a46e2649db6bb98aca58 (diff) | |
| parent | e5aa5a9d7e97b975316b8cc18554743cccf06474 (diff) | |
| download | Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.zip Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.gz Qt-69354f37173b7bfcf7ea0f37175a34b8766afcbb.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
bin/syncqt
src/opengl/qgl.cpp
tools/configure/configureapp.cpp
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 9e69816..943a195 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5262,6 +5262,8 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FragmentProgram; if (extensions.match("GL_ARB_fragment_shader")) glExtensions |= FragmentShader; + if (extensions.match("GL_ARB_ES2_compatibility")) + glExtensions |= ES2Compatibility; if (extensions.match("GL_ARB_texture_mirrored_repeat")) glExtensions |= MirroredRepeat; if (extensions.match("GL_EXT_framebuffer_object")) @@ -5282,6 +5284,7 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FramebufferObject; glExtensions |= GenerateMipmap; glExtensions |= FragmentShader; + glExtensions |= ES2Compatibility; #endif #if defined(QT_OPENGL_ES_1) if (extensions.match("GL_OES_framebuffer_object")) |