diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:43:10 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:43:10 (GMT) |
| commit | bfde87dcc8d0f363ecf1da59482c15445b00484c (patch) | |
| tree | 0d0c01b1611caf91ba900bd2b67a8806590254cc /demos/boxes/glextensions.h | |
| parent | 27fadaa7eb2d58b47e7f0f508e3402e7a8de3894 (diff) | |
| parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
| download | Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.zip Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.tar.gz Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'demos/boxes/glextensions.h')
| -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 4755532..af36e29 100644 --- a/demos/boxes/glextensions.h +++ b/demos/boxes/glextensions.h @@ -103,8 +103,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 @@ -135,7 +138,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); |