summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2011-06-08 12:11:14 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2011-06-08 12:11:14 (GMT)
commit33db4e2533b3e4e07d37b651b65491195be403ab (patch)
tree1461e8762d3cb5868d3480fd61c2fff69f89b37c /src/imports
parentc6a8f35846df86a87591372d022e54a701591f5b (diff)
parentea7576eecacaaf5e82f5ebaf847dc9690baa9fca (diff)
downloadQt-33db4e2533b3e4e07d37b651b65491195be403ab.zip
Qt-33db4e2533b3e4e07d37b651b65491195be403ab.tar.gz
Qt-33db4e2533b3e4e07d37b651b65491195be403ab.tar.bz2
Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7
Diffstat (limited to 'src/imports')
-rwxr-xr-xsrc/imports/shaders/glfunctions.h20
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")))