diff options
| author | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-01 11:21:27 +0300 |
|---|---|---|
| committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-06-01 11:21:27 +0300 |
| commit | 9418d44a57501f407d36146fbd11ee77e0b3ab45 (patch) | |
| tree | a81a3c5b780cf18ed7a3eac8bdd2cf70888759c5 | |
| parent | 2c11f9346a9e94f175875ed02e7e3fdc957a1708 (diff) | |
| parent | 40ce07c383193ff63e5150603b5275c10edc0b10 (diff) | |
Merge commit 'refs/merge-requests/4' of gitorious.org:qt-labs/qml1-shadersplugin into merge-requests/4
| -rwxr-xr-x | src/glfunctions.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/glfunctions.h b/src/glfunctions.h index 03b88d1..8529519 100755 --- a/src/glfunctions.h +++ b/src/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"))) |