diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 05:14:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 05:14:55 (GMT) |
| commit | 90be1766e9d0e0fbb6e68e02030f4bbb946a62c8 (patch) | |
| tree | 8f67cc323eb3a8a5f1fea723783e8efda35686c5 | |
| parent | 105704d626f293f0c8fc08ef6978c401402148c6 (diff) | |
| parent | bf5c25c4e7571475255e1d9de307913bee228d10 (diff) | |
| download | Qt-90be1766e9d0e0fbb6e68e02030f4bbb946a62c8.zip Qt-90be1766e9d0e0fbb6e68e02030f4bbb946a62c8.tar.gz Qt-90be1766e9d0e0fbb6e68e02030f4bbb946a62c8.tar.bz2 | |
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:
Don't resolve GLSL extensions if no shaders
| -rw-r--r-- | src/opengl/qglextensions.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index c091191..433ccae 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -233,6 +233,10 @@ bool qt_resolve_glsl_extensions(QGLContext *ctx) if (glCreateShader) return true; + // Must at least have the FragmentShader extension to continue. + if (!(QGLExtensions::glExtensions() & QGLExtensions::FragmentShader)) + return false; + glCreateShader = (_glCreateShader) ctx->getProcAddress(QLatin1String("glCreateShader")); if (glCreateShader) { glShaderSource = (_glShaderSource) ctx->getProcAddress(QLatin1String("glShaderSource")); |