diff options
| author | David Faure <faure@kde.org> | 2009-05-22 08:49:30 (GMT) |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2009-05-22 08:49:30 (GMT) |
| commit | 6d494ed2971597ee134d1fbf8019432d07286791 (patch) | |
| tree | b2009af31e3a1d3cbb6a65482d10bf104f375844 /demos | |
| parent | f645346d32468ae3ded46f42d4e4f27135526913 (diff) | |
| parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
| download | Qt-6d494ed2971597ee134d1fbf8019432d07286791.zip Qt-6d494ed2971597ee134d1fbf8019432d07286791.tar.gz Qt-6d494ed2971597ee134d1fbf8019432d07286791.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
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); |