diff options
| author | Brian Paul <brianp@vmware.com> | 2010-09-14 09:37:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-09-14 09:37:37 -0600 |
| commit | 7993832c12bba578010005b344dcd3817be84a42 (patch) | |
| tree | 59c27bba7e33fdc3ac7673737b17e1c7e298db93 /src/mesa/main | |
| parent | 83f5f50f2f69adae497c71ac48e4e0177979ebff (diff) | |
mesa: update to version 64 of GL/glext.h
A number of other files had to be updated as well because const
qualifiers were added to the glMultiDrawArrays() function.
Also, GL_FIXED is now defined in glext.h.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/dlist.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/glheader.h | 6 | ||||
| -rw-r--r-- | src/mesa/main/varray.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/varray.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 6928d21a21..d847d4d5d3 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -8892,8 +8892,8 @@ exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) /* GL_EXT_multi_draw_arrays */ static void GLAPIENTRY -exec_MultiDrawArraysEXT(GLenum mode, GLint * first, - GLsizei * count, GLsizei primcount) +exec_MultiDrawArraysEXT(GLenum mode, const GLint *first, + const GLsizei *count, GLsizei primcount) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index 068a0f0994..45f7b55ad2 100644 --- a/src/mesa/main/glheader.h +++ b/src/mesa/main/glheader.h @@ -55,11 +55,11 @@ #include "GL/internal/glcore.h" -#ifndef GL_FIXED -#define GL_FIXED 0x140C +/** + * GL_FIXED is defined in glext.h version 64 but these typedefs aren't (yet). + */ typedef int GLfixed; typedef int GLclampx; -#endif #ifndef GL_OES_EGL_image diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 6c0cfc4e32..d19de7ff62 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -1256,8 +1256,8 @@ _mesa_UnlockArraysEXT( void ) /* GL_EXT_multi_draw_arrays */ /* Somebody forgot to spec the first and count parameters as const! <sigh> */ void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first, - GLsizei *count, GLsizei primcount ) +_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, + const GLsizei *count, GLsizei primcount ) { GET_CURRENT_CONTEXT(ctx); GLint i; diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index 26889f5ad4..c7c3e3ec70 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -159,8 +159,8 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer); extern void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, GLint *first, - GLsizei *count, GLsizei primcount ); +_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, + const GLsizei *count, GLsizei primcount ); extern void GLAPIENTRY _mesa_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type, |