diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
| commit | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (patch) | |
| tree | f86937d9126b2d543ffd13f861a1271f48bd69e6 /mesalib/include/GLES | |
| parent | acad661e29a4f09d06f829fdfea949814da57da6 (diff) | |
| parent | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (diff) | |
| download | vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.gz vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.bz2 vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
Diffstat (limited to 'mesalib/include/GLES')
| -rw-r--r-- | mesalib/include/GLES/glext.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/include/GLES/glext.h b/mesalib/include/GLES/glext.h index 5b46ae6d0..67092fdcb 100644 --- a/mesalib/include/GLES/glext.h +++ b/mesalib/include/GLES/glext.h @@ -1,7 +1,7 @@ #ifndef __glext_h_ #define __glext_h_ -/* $Revision: 19260 $ on $Date:: 2012-09-20 11:30:36 -0700 #$ */ +/* $Revision: 20798 $ on $Date:: 2013-03-07 01:19:34 -0800 #$ */ #ifdef __cplusplus extern "C" { @@ -1055,10 +1055,10 @@ typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum #ifndef GL_EXT_multi_draw_arrays #define GL_EXT_multi_draw_arrays 1 #ifdef GL_GLEXT_PROTOTYPES -GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); +GL_API void GL_APIENTRY glMultiDrawArraysEXT (GLenum, const GLint *, const GLsizei *, GLsizei); GL_API void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); +typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); #endif |