diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-03 10:59:10 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-03 10:59:10 (GMT) |
| commit | 8559f2d8db6f99292fc8a26623e166f64f9d4a8f (patch) | |
| tree | 73218cc085c5f74fb5667a7c2f49915a5b71ade1 | |
| parent | 0cbe2a23966116e642fee4ccc34aeac73a5c57cd (diff) | |
| download | Qt-8559f2d8db6f99292fc8a26623e166f64f9d4a8f.zip Qt-8559f2d8db6f99292fc8a26623e166f64f9d4a8f.tar.gz Qt-8559f2d8db6f99292fc8a26623e166f64f9d4a8f.tar.bz2 | |
Fix build breakage after rebasing on graphics-main
Reviewed-by: Trustme
| -rw-r--r-- | src/opengl/gl2paintengineex/qglshader.cpp | 1 | ||||
| -rw-r--r-- | src/opengl/qglextensions_p.h | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/opengl/gl2paintengineex/qglshader.cpp b/src/opengl/gl2paintengineex/qglshader.cpp index 4ac6e61..ea4cae9 100644 --- a/src/opengl/gl2paintengineex/qglshader.cpp +++ b/src/opengl/gl2paintengineex/qglshader.cpp @@ -51,6 +51,7 @@ #if !defined(QT_OPENGL_ES_2) static const char *qglslDefines = "#define lowp\n#define mediump\n#define highp\n"; +#include "private/qgl_p.h" #else static const char *qglslDefines = ""; #endif diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 69632e7..9249730 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -412,18 +412,10 @@ struct QGLExtensionFuncs _glUnmapBufferARB qt_glUnmapBufferARB; _glGetActiveAttrib qt_glGetActiveAttrib; - _glGetAttribLocation qt_glGetAttribLocation; _glGetActiveUniform qt_glGetActiveUniform; - _glGetProgramInfoLog qt_glGetProgramInfoLog; _glUniform1f qt_glUniform1f; _glUniform2f qt_glUniform2f; _glUniform4f qt_glUniform4f; - _glUniformMatrix2fv qt_glUniformMatrix2fv; - _glUniformMatrix3fv qt_glUniformMatrix3fv; - _glUniformMatrix4fv qt_glUniformMatrix4fv; - _glEnableVertexAttribArray qt_glEnableVertexAttribArray; - _glDisableVertexAttribArray qt_glDisableVertexAttribArray; - _glVertexAttribPointer qt_glVertexAttribPointer; _glStencilOpSeparate qt_glStencilOpSeparate; }; |