summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglextensions.cpp
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2009-02-12 14:59:43 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-04-01 14:32:47 (GMT)
commite8f91c93de3599309d8fe11fd94318bfdc51d36c (patch)
tree2d5b25eec1293e6f1403e3f854a84534ed758ed3 /src/opengl/qglextensions.cpp
parentd2aaca5abc5c2853081b50407fc8ee7756d9ddfa (diff)
downloadQt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.zip
Qt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.tar.gz
Qt-e8f91c93de3599309d8fe11fd94318bfdc51d36c.tar.bz2
Merge branch 'gl2text' of ..\qt-main
Diffstat (limited to 'src/opengl/qglextensions.cpp')
-rw-r--r--src/opengl/qglextensions.cpp21
1 files changed, 20 insertions, 1 deletions
diff --git a/src/opengl/qglextensions.cpp b/src/opengl/qglextensions.cpp
index 8357cf9..b054fe8 100644
--- a/src/opengl/qglextensions.cpp
+++ b/src/opengl/qglextensions.cpp
@@ -176,10 +176,29 @@ bool qt_resolve_glsl_extensions(QGLContext *ctx)
glUniform1fv = (_glUniform1fv) ctx->getProcAddress(QLatin1String("glUniform1fv"));
glUniform1i = (_glUniform1i) ctx->getProcAddress(QLatin1String("glUniform1i"));
+ glGetActiveAttrib = (_glGetActiveAttrib) ctx->getProcAddress(QLatin1String("glGetActiveAttrib"));
+ glGetAttribLocation = (_glGetAttribLocation) ctx->getProcAddress(QLatin1String("glGetAttribLocation"));
+ glGetActiveUniform = (_glGetActiveUniform) ctx->getProcAddress(QLatin1String("glGetActiveUniform"));
+ glGetProgramInfoLog = (_glGetProgramInfoLog) ctx->getProcAddress(QLatin1String("glGetProgramInfoLog"));
+ glUniform1f = (_glUniform1f) ctx->getProcAddress(QLatin1String("glUniform1f"));
+ glUniform2f = (_glUniform2f) ctx->getProcAddress(QLatin1String("glUniform2f"));
+ glUniform4f = (_glUniform4f) ctx->getProcAddress(QLatin1String("glUniform4f"));
+ glUniformMatrix2fv = (_glUniformMatrix2fv) ctx->getProcAddress(QLatin1String("glUniformMatrix2fv"));
+ glUniformMatrix3fv = (_glUniformMatrix3fv) ctx->getProcAddress(QLatin1String("glUniformMatrix3fv"));
+ glUniformMatrix4fv = (_glUniformMatrix4fv) ctx->getProcAddress(QLatin1String("glUniformMatrix4fv"));
+ glEnableVertexAttribArray = (_glEnableVertexAttribArray) ctx->getProcAddress(QLatin1String("glEnableVertexAttribArray"));
+ glDisableVertexAttribArray = (_glDisableVertexAttribArray) ctx->getProcAddress(QLatin1String("glDisableVertexAttribArray"));
+ glVertexAttribPointer = (_glVertexAttribPointer) ctx->getProcAddress(QLatin1String("glVertexAttribPointer"));
+ glStencilOpSeparate = (_glStencilOpSeparate) ctx->getProcAddress(QLatin1String("glStencilOpSeparate"));
+
return glCreateShader && glShaderSource && glCompileShader && glDeleteProgram &&
glCreateProgram && glAttachShader && glDetachShader && glLinkProgram && glUseProgram &&
glDeleteProgram && glGetShaderInfoLog && glGetShaderiv && glGetProgramiv && glGetUniformLocation &&
- glUniform1i && glUniform1fv && glUniform2fv && glUniform3fv && glUniform4fv;
+ glUniform1i && glUniform1fv && glUniform2fv && glUniform3fv && glUniform4fv &&
+ glGetActiveAttrib && glGetAttribLocation && glGetActiveUniform && glGetProgramInfoLog &&
+ glUniform1f && glUniform2f && glUniform4f &&
+ glUniformMatrix2fv && glUniformMatrix3fv && glUniformMatrix4fv &&
+ glEnableVertexAttribArray && glDisableVertexAttribArray && glVertexAttribPointer && glStencilOpSeparate;
}
QT_END_NAMESPACE