diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-08 12:09:17 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2010-02-08 12:09:17 (GMT) |
| commit | 492f1f4267074525e33fb8571c12d520e92163a6 (patch) | |
| tree | f121cc4aabf683208dda00b50bc84bca55fffb7a /src/opengl/qglextensions.cpp | |
| parent | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (diff) | |
| parent | e98c07e5247a5ad4876c4add595ec1897b73b190 (diff) | |
| download | Qt-492f1f4267074525e33fb8571c12d520e92163a6.zip Qt-492f1f4267074525e33fb8571c12d520e92163a6.tar.gz Qt-492f1f4267074525e33fb8571c12d520e92163a6.tar.bz2 | |
Merge branch 'geometry-shaders-to-integrate'
Conflicts:
src/opengl/qglshaderprogram.cpp
Diffstat (limited to 'src/opengl/qglextensions.cpp')
| -rw-r--r-- | src/opengl/qglextensions.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp index 03fca39..02d5501 100644 --- a/src/opengl/qglextensions.cpp +++ b/src/opengl/qglextensions.cpp @@ -224,6 +224,12 @@ bool qt_resolve_buffer_extensions(QGLContext *ctx) bool qt_resolve_glsl_extensions(QGLContext *ctx) { + // Geometry shaders are optional... + glProgramParameteriEXT = (_glProgramParameteriEXT) ctx->getProcAddress(QLatin1String("glProgramParameteriEXT")); + glFramebufferTextureEXT = (_glFramebufferTextureEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureEXT")); + glFramebufferTextureLayerEXT = (_glFramebufferTextureLayerEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureLayerEXT")); + glFramebufferTextureFaceEXT = (_glFramebufferTextureFaceEXT) ctx->getProcAddress(QLatin1String("glFramebufferTextureFaceEXT")); + #if defined(QT_OPENGL_ES_2) // The GLSL shader functions are always present in OpenGL/ES 2.0. // The only exceptions are glGetProgramBinaryOES and glProgramBinaryOES. |