diff options
| author | Brian Paul <[email protected]> | 2010-09-14 09:37:35 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-09-14 09:37:37 -0600 |
| commit | 7993832c12bba578010005b344dcd3817be84a42 (patch) | |
| tree | 59c27bba7e33fdc3ac7673737b17e1c7e298db93 /src/glx | |
| 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/glx')
| -rw-r--r-- | src/glx/indirect.c | 6 | ||||
| -rw-r--r-- | src/glx/indirect.h | 2 | ||||
| -rw-r--r-- | src/glx/indirect_init.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/glx/indirect.c b/src/glx/indirect.c index c0fff6c4dcf..2b09c1c3b5d 100644 --- a/src/glx/indirect.c +++ b/src/glx/indirect.c @@ -91,7 +91,7 @@ __glXReadReply(Display * dpy, size_t size, void *dest, } NOINLINE void -__glXReadPixelReply(Display * dpy, struct glx_context * gc, unsigned max_dim, +__glXReadPixelReply(Display * dpy, struct glx_context *gc, unsigned max_dim, GLint width, GLint height, GLint depth, GLenum format, GLenum type, void *dest, GLboolean dimensions_in_reply) { @@ -138,7 +138,7 @@ __glXReadPixelReply(Display * dpy, struct glx_context * gc, unsigned max_dim, #define X_GLXSingle 0 NOINLINE FASTCALL GLubyte * -__glXSetupSingleRequest(struct glx_context * gc, GLint sop, GLint cmdlen) +__glXSetupSingleRequest(struct glx_context *gc, GLint sop, GLint cmdlen) { xGLXSingleReq *req; Display *const dpy = gc->currentDpy; @@ -153,7 +153,7 @@ __glXSetupSingleRequest(struct glx_context * gc, GLint sop, GLint cmdlen) } NOINLINE FASTCALL GLubyte * -__glXSetupVendorRequest(struct glx_context * gc, GLint code, GLint vop, +__glXSetupVendorRequest(struct glx_context *gc, GLint code, GLint vop, GLint cmdlen) { xGLXVendorPrivateReq *req; diff --git a/src/glx/indirect.h b/src/glx/indirect.h index 36d68b066cc..282de75c40c 100644 --- a/src/glx/indirect.h +++ b/src/glx/indirect.h @@ -600,7 +600,7 @@ extern HIDDEN void __indirect_glSecondaryColor3uivEXT(const GLuint * v); extern HIDDEN void __indirect_glSecondaryColor3usEXT(GLushort red, GLushort green, GLushort blue); extern HIDDEN void __indirect_glSecondaryColor3usvEXT(const GLushort * v); extern HIDDEN void __indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); -extern HIDDEN void __indirect_glMultiDrawArraysEXT(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); +extern HIDDEN void __indirect_glMultiDrawArraysEXT(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); extern HIDDEN void __indirect_glMultiDrawElementsEXT(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); extern HIDDEN void __indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid * pointer); extern HIDDEN void __indirect_glFogCoorddEXT(GLdouble coord); diff --git a/src/glx/indirect_init.c b/src/glx/indirect_init.c index ea051883988..9f1ee5930fc 100644 --- a/src/glx/indirect_init.c +++ b/src/glx/indirect_init.c @@ -53,7 +53,7 @@ static int NoOp(void) * Create and initialize a new GL dispatch table. The table is initialized * with GLX indirect rendering protocol functions. */ -struct _glapi_table *__glXNewIndirectAPI( void ) +struct _glapi_table * __glXNewIndirectAPI( void ) { struct _glapi_table *glAPI; GLuint entries; |