diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 10:54:15 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-10-12 11:22:30 (GMT) |
| commit | 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51 (patch) | |
| tree | 82a9611c6c24740a5e7f0b5c7df8a8f08576513c /src/opengl/qglshaderprogram.cpp | |
| parent | 25094190fc4886e7c5a878bf923a387bbbab58de (diff) | |
| download | Qt-7cd0a90344d340f22b6b2d3afeef092dbaf2cd51.zip Qt-7cd0a90344d340f22b6b2d3afeef092dbaf2cd51.tar.gz Qt-7cd0a90344d340f22b6b2d3afeef092dbaf2cd51.tar.bz2 | |
Revert "Don't define highp/mediump/lowp if desktop GL has them"
This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.
Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
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) { |