diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
| commit | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (patch) | |
| tree | 64a13ad1e625f35811286d8d468fe9f504a29df8 /demos | |
| parent | 64fb80c40cb0fd978923d1931670ba70466bc76e (diff) | |
| parent | 56a8e78869325453010fb6c41a5e2b9e6f8f1c95 (diff) | |
| download | Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.zip Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.gz Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/boxes/glextensions.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/demos/boxes/glextensions.h b/demos/boxes/glextensions.h index 74617d6..7ba3b32 100644 --- a/demos/boxes/glextensions.h +++ b/demos/boxes/glextensions.h @@ -120,8 +120,11 @@ glUnmapBuffer //#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A #endif +#ifndef GL_ARB_vertex_buffer_object +typedef ptrdiff_t GLsizeiptrARB; +#endif + #ifndef GL_VERSION_1_5 -typedef ptrdiff_t GLsizeiptr; #define GL_ARRAY_BUFFER 0x8892 #define GL_ELEMENT_ARRAY_BUFFER 0x8893 #define GL_READ_WRITE 0x88BA @@ -185,7 +188,7 @@ typedef void (APIENTRY *_glTexImage3D) (GLenum, GLint, GLenum, GLsizei, GLsizei, typedef void (APIENTRY *_glGenBuffers) (GLsizei, GLuint *); typedef void (APIENTRY *_glBindBuffer) (GLenum, GLuint); -typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptr, const GLvoid *, GLenum); +typedef void (APIENTRY *_glBufferData) (GLenum, GLsizeiptrARB, const GLvoid *, GLenum); typedef void (APIENTRY *_glDeleteBuffers) (GLsizei, const GLuint *); typedef void *(APIENTRY *_glMapBuffer) (GLenum, GLenum); typedef GLboolean (APIENTRY *_glUnmapBuffer) (GLenum); |