diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-12 22:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-12 22:00:13 (GMT) |
| commit | ad757b9407506808393511d1baf8381a57aac4ab (patch) | |
| tree | d57f33f5d9cbe67c72ea5686b5ea44fc2598210f /src/opengl | |
| parent | 087414e3ee4dd4c9f8f13c5a9eb69c5f70fb3d59 (diff) | |
| parent | dfb0f8600187b44c3a3e10ef40ae2733de88f241 (diff) | |
| download | Qt-ad757b9407506808393511d1baf8381a57aac4ab.zip Qt-ad757b9407506808393511d1baf8381a57aac4ab.tar.gz Qt-ad757b9407506808393511d1baf8381a57aac4ab.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 3 | ||||
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 10 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 9e74e04..7f25887 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5264,8 +5264,6 @@ QGLExtensions::Extensions QGLExtensions::currentContextExtensions() 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")) glExtensions |= MirroredRepeat; if (extensions.match("GL_EXT_framebuffer_object")) @@ -5286,7 +5284,6 @@ 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")) diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 623eeaf..387c8f7 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -284,8 +284,7 @@ public: DDSTextureCompression = 0x00008000, ETC1TextureCompression = 0x00010000, PVRTCTextureCompression = 0x00020000, - FragmentShader = 0x00040000, - ES2Compatibility = 0x00080000 + FragmentShader = 0x00040000 }; Q_DECLARE_FLAGS(Extensions, Extension) diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index bc1c009..74382b0 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -97,10 +97,6 @@ QT_BEGIN_NAMESPACE to just features that are present in GLSL/ES, and avoid standard variable names that only work on the desktop. - If the \c{GL_ARB_ES2_compatibility} extension is present, - then the above prefix is not added because the desktop OpenGL - implementation supports precision qualifiers. - \section1 Simple shader example \snippet doc/src/snippets/code/src_opengl_qglshaderprogram.cpp 1 @@ -398,10 +394,8 @@ bool QGLShader::compileSourceCode(const char *source) srclen.append(GLint(headerLen)); } #ifdef QGL_DEFINE_QUALIFIERS - if (!(QGLExtensions::glExtensions() & QGLExtensions::ES2Compatibility)) { - src.append(qualifierDefines); - srclen.append(GLint(sizeof(qualifierDefines) - 1)); - } + src.append(qualifierDefines); + srclen.append(GLint(sizeof(qualifierDefines) - 1)); #endif #ifdef QGL_REDEFINE_HIGHP if (d->shaderType == Fragment) { |