diff options
author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-13 00:50:31 (GMT) |
---|---|---|
committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-13 00:50:31 (GMT) |
commit | 6155050f68cc86c445552da61a5f240c16f5e2cd (patch) | |
tree | eccb560efebc61a949f13e4a3e124460c001eb8e /src/opengl/qgl.cpp | |
parent | b0d2a439314bc86e6e15fe033c1edaee471b4b95 (diff) | |
download | Qt-6155050f68cc86c445552da61a5f240c16f5e2cd.zip Qt-6155050f68cc86c445552da61a5f240c16f5e2cd.tar.gz Qt-6155050f68cc86c445552da61a5f240c16f5e2cd.tar.bz2 |
Don't define highp/mediump/lowp if desktop GL has them
OpenGL 4.0 systems now have compatibility with ES2, including
support for the precision qualifiers. If the GL_ARB_ES2_compatibility
extension is present, then we don't define highp/mediump/lowp
to the empty string.
Task-number: QTBUG-12862
Reviewed-by: Sarah Smith
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 0521bab..0137c85 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4923,6 +4923,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")) @@ -4941,6 +4943,7 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() glExtensions |= FramebufferObject; glExtensions |= GenerateMipmap; glExtensions |= FragmentShader; + glExtensions |= ES2Compatibility; #endif #if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL) if (extensions.match("GL_OES_framebuffer_object")) |