diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 07:54:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-08 07:54:52 (GMT) |
| commit | ea7576eecacaaf5e82f5ebaf847dc9690baa9fca (patch) | |
| tree | 3eba16bc5c0c6a698f01892d2663fc7f516016bb /src | |
| parent | f7dde050b1f4ef31bf386f447c723ffd497058c7 (diff) | |
| parent | 7b0762c17f9899e68c0f67480a81b25c6f0c7dda (diff) | |
| download | Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.zip Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.tar.gz Qt-ea7576eecacaaf5e82f5ebaf847dc9690baa9fca.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
Fixed qmlshadersplugin on windows VC2008 toolchain.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/imports/shaders/glfunctions.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/shaders/glfunctions.h b/src/imports/shaders/glfunctions.h index 03b88d1..8529519 100755 --- a/src/imports/shaders/glfunctions.h +++ b/src/imports/shaders/glfunctions.h @@ -45,26 +45,26 @@ #ifndef QT_OPENGL_ES #ifndef Q_WS_MAC -# ifndef QGLF_APIENTRYP -# ifdef QGLF_APIENTRY -# define QGLF_APIENTRYP QGLF_APIENTRY * +# ifndef APIENTRYP +# ifdef APIENTRY +# define APIENTRYP APIENTRY * # else -# define QGLF_APIENTRY -# define QGLF_APIENTRYP * +# define APIENTRY +# define APIENTRYP * # endif # endif #else -# define QGLF_APIENTRY -# define QGLF_APIENTRYP * +# define APIENTRY +# define APIENTRYP * #endif #define GL_TEXTURE0 0x84C0 #define GL_CLAMP_TO_EDGE 0x812F #define GL_BGRA 0x80E1 -typedef void (QGLF_APIENTRYP type_glActiveTexture)(GLenum texture); -typedef void (QGLF_APIENTRYP type_glGenerateMipmap)(GLenum target); -typedef void (QGLF_APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); +typedef void (APIENTRYP type_glActiveTexture)(GLenum texture); +typedef void (APIENTRYP type_glGenerateMipmap)(GLenum target); +typedef void (APIENTRYP type_glVertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); #define glActiveTexture ((type_glActiveTexture)QGLContext::currentContext()->getProcAddress(QLatin1String("glActiveTexture"))) #define glGenerateMipmap ((type_glGenerateMipmap)QGLContext::currentContext()->getProcAddress(QLatin1String("glGenerateMipmap"))) |