diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
commit | 1077edd108129a628195708c787c3922d2270c37 (patch) | |
tree | 1346bb4e46562b6d6fba22c7e81efa30470044bb /src/opengl/qglfunctions.h | |
parent | 0e3823d30c2294eb11c205ca11fca55508478151 (diff) | |
parent | c41153e69336701488385d9194d72e72164b28b8 (diff) |
Merge remote branch 'origin/master' into refactor
Diffstat (limited to 'src/opengl/qglfunctions.h')
-rw-r--r-- | src/opengl/qglfunctions.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 44d9bad9fa..759af4f939 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -59,6 +59,10 @@ QT_MODULE(OpenGL) typedef ptrdiff_t qgl_GLintptr; typedef ptrdiff_t qgl_GLsizeiptr; +#ifdef Q_WS_WIN +# define QGLF_APIENTRY APIENTRY +#endif + #ifndef Q_WS_MAC # ifndef QGLF_APIENTRYP # ifdef QGLF_APIENTRY @@ -1945,6 +1949,9 @@ inline void QGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum #ifndef GL_RGBA4 #define GL_RGBA4 0x8056 #endif +#ifndef GL_BGRA +#define GL_BGRA 0x80E1 +#endif #ifndef GL_SAMPLE_ALPHA_TO_COVERAGE #define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E #endif |