diff options
author | Ian Romanick <idr@us.ibm.com> | 2005-06-24 18:35:31 +0000 |
---|---|---|
committer | Ian Romanick <idr@us.ibm.com> | 2005-06-24 18:35:31 +0000 |
commit | 5aafea03af051fa06589580205342001a8eb2693 (patch) | |
tree | d64bb39891c7313296d5d00fe305e698ca09a01c /src/glx/x11/indirect.c | |
parent | 3fb86eefe8b22e8d95111ef49feb0a91d865fd00 (diff) |
Fix non-x86 specific builds. The changes from glTexImage3DEXT to
glTexImage3D that caused me so many problems during the re-development
of the API scripts reared its ugly head again. This has been fixed by
tracking the parameter string for each entry-point individually.
This has the annoying side-effect that the names of the parameters in
all aliases of a function must be the same or gl_apitemp.py will
generate bad code. :( The changes in
src/mesa/glapi/{gl_API.xml,glapitable.h} and src/glx/x11/* are caused
by fixing the parameter names in various function aliases that didn't
match.
Reported by: Eric Anholt, Jacob Jansen
Diffstat (limited to 'src/glx/x11/indirect.c')
-rw-r--r-- | src/glx/x11/indirect.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c index 27a818ddf3d..18e6e8cf8df 100644 --- a/src/glx/x11/indirect.c +++ b/src/glx/x11/indirect.c @@ -6270,20 +6270,20 @@ __indirect_glAreProgramsResidentNV(GLsizei n, const GLuint * ids, GLboolean * re #define X_GLrop_BindProgramNV 4180 void -__indirect_glBindProgramNV(GLenum target, GLuint id) +__indirect_glBindProgramNV(GLenum target, GLuint program) { __GLXcontext * const gc = __glXGetCurrentContext(); const GLuint cmdlen = 12; emit_header(gc->pc, X_GLrop_BindProgramNV, cmdlen); (void) memcpy((void *)(gc->pc + 4), (void *)(&target), 4); - (void) memcpy((void *)(gc->pc + 8), (void *)(&id), 4); + (void) memcpy((void *)(gc->pc + 8), (void *)(&program), 4); gc->pc += cmdlen; if (__builtin_expect(gc->pc > gc->limit, 0)) { (void) __glXFlushRenderBuffer(gc, gc->pc); } } #define X_GLvop_DeleteProgramsNV 1294 void -__indirect_glDeleteProgramsNV(GLsizei n, const GLuint * ids) +__indirect_glDeleteProgramsNV(GLsizei n, const GLuint * programs) { __GLXcontext * const gc = __glXGetCurrentContext(); Display * const dpy = gc->currentDpy; @@ -6291,7 +6291,7 @@ __indirect_glDeleteProgramsNV(GLsizei n, const GLuint * ids) if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { GLubyte const * pc = __glXSetupVendorRequest(gc, X_GLXVendorPrivate, X_GLvop_DeleteProgramsNV, cmdlen); (void) memcpy((void *)(pc + 0), (void *)(&n), 4); - (void) memcpy((void *)(pc + 4), (void *)(ids), (n * 4)); + (void) memcpy((void *)(pc + 4), (void *)(programs), (n * 4)); UnlockDisplay(dpy); SyncHandle(); } return; @@ -6313,7 +6313,7 @@ __indirect_glExecuteProgramNV(GLenum target, GLuint id, const GLfloat * params) #define X_GLvop_GenProgramsNV 1295 void -__indirect_glGenProgramsNV(GLsizei n, GLuint * ids) +__indirect_glGenProgramsNV(GLsizei n, GLuint * programs) { __GLXcontext * const gc = __glXGetCurrentContext(); Display * const dpy = gc->currentDpy; @@ -6321,7 +6321,7 @@ __indirect_glGenProgramsNV(GLsizei n, GLuint * ids) if (__builtin_expect((n >= 0) && (dpy != NULL), 1)) { GLubyte const * pc = __glXSetupVendorRequest(gc, X_GLXVendorPrivateWithReply, X_GLvop_GenProgramsNV, cmdlen); (void) memcpy((void *)(pc + 0), (void *)(&n), 4); - (void) __glXReadReply(dpy, 4, ids, GL_FALSE); + (void) __glXReadReply(dpy, 4, programs, GL_FALSE); UnlockDisplay(dpy); SyncHandle(); } return; @@ -6417,7 +6417,7 @@ __indirect_glGetTrackMatrixivNV(GLenum target, GLuint address, GLenum pname, GLi #define X_GLvop_IsProgramNV 1304 GLboolean -__indirect_glIsProgramNV(GLuint id) +__indirect_glIsProgramNV(GLuint program) { __GLXcontext * const gc = __glXGetCurrentContext(); Display * const dpy = gc->currentDpy; @@ -6425,7 +6425,7 @@ __indirect_glIsProgramNV(GLuint id) const GLuint cmdlen = 4; if (__builtin_expect(dpy != NULL, 1)) { GLubyte const * pc = __glXSetupVendorRequest(gc, X_GLXVendorPrivateWithReply, X_GLvop_IsProgramNV, cmdlen); - (void) memcpy((void *)(pc + 0), (void *)(&id), 4); + (void) memcpy((void *)(pc + 0), (void *)(&program), 4); retval = (GLboolean) __glXReadReply(dpy, 0, NULL, GL_FALSE); UnlockDisplay(dpy); SyncHandle(); } @@ -7144,13 +7144,13 @@ __indirect_glVertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte * v) #define X_GLrop_PointParameteriNV 4221 void -__indirect_glPointParameteriNV(GLenum pname, GLint params) +__indirect_glPointParameteriNV(GLenum pname, GLint param) { __GLXcontext * const gc = __glXGetCurrentContext(); const GLuint cmdlen = 12; emit_header(gc->pc, X_GLrop_PointParameteriNV, cmdlen); (void) memcpy((void *)(gc->pc + 4), (void *)(&pname), 4); - (void) memcpy((void *)(gc->pc + 8), (void *)(¶ms), 4); + (void) memcpy((void *)(gc->pc + 8), (void *)(¶m), 4); gc->pc += cmdlen; if (__builtin_expect(gc->pc > gc->limit, 0)) { (void) __glXFlushRenderBuffer(gc, gc->pc); } } |