diff options
author | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-08 07:14:56 (GMT) |
---|---|---|
committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-08 07:14:56 (GMT) |
commit | a2f52802bd7183ecb2ac2ba967393f0781fa7126 (patch) | |
tree | c03fb3945237d3eaf42a68124c90e1c25c2e5e1f | |
parent | 071088a8bd1bac104adfcb648cd81e6c020e4e69 (diff) | |
download | Qt-a2f52802bd7183ecb2ac2ba967393f0781fa7126.zip Qt-a2f52802bd7183ecb2ac2ba967393f0781fa7126.tar.gz Qt-a2f52802bd7183ecb2ac2ba967393f0781fa7126.tar.bz2 |
Fixed qmlshadersplugin on windows VC2008 toolchain.
This fix is originally submitted by George Tavares. APIENTRY is a Win32 macro defined as stdcall__ *
Reviewed-by: Kim Gronholm
-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"))) |