X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fglx%2Findirect_vertex_program.c;h=54a936d29b569a04426f24c375a2d1626b9d4d77;hb=16f1023037908a683c62521af4d44e28023f2630;hp=d822a7ee56ee7bdd4853e63f3c94f231a6f51b99;hpb=685340a53e1dcb2a888e634ee71ba24356befe69;p=mesa.git

diff --git a/src/glx/indirect_vertex_program.c b/src/glx/indirect_vertex_program.c
index d822a7ee56e..54a936d29b5 100644
--- a/src/glx/indirect_vertex_program.c
+++ b/src/glx/indirect_vertex_program.c
@@ -37,7 +37,7 @@
 static void
 do_vertex_attrib_enable(GLuint index, GLboolean val)
 {
-   __GLXcontext *gc = __glXGetCurrentContext();
+   struct glx_context *gc = __glXGetCurrentContext();
    __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
 
    if (!__glXSetArrayEnable(state, GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB,
@@ -48,14 +48,14 @@ do_vertex_attrib_enable(GLuint index, GLboolean val)
 
 
 void
-__indirect_glEnableVertexAttribArrayARB(GLuint index)
+__indirect_glEnableVertexAttribArray(GLuint index)
 {
    do_vertex_attrib_enable(index, GL_TRUE);
 }
 
 
 void
-__indirect_glDisableVertexAttribArrayARB(GLuint index)
+__indirect_glDisableVertexAttribArray(GLuint index)
 {
    do_vertex_attrib_enable(index, GL_FALSE);
 }
@@ -65,7 +65,7 @@ static void
 get_parameter(unsigned opcode, unsigned size, GLenum target, GLuint index,
               void *params)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
    Display *const dpy = gc->currentDpy;
    const GLuint cmdlen = 12;
 
@@ -119,10 +119,10 @@ __indirect_glGetProgramLocalParameterdvARB(GLenum target, GLuint index,
 
 
 void
-__indirect_glGetVertexAttribPointervNV(GLuint index, GLenum pname,
+__indirect_glGetVertexAttribPointerv(GLuint index, GLenum pname,
                                        GLvoid ** pointer)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
    __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
 
    if (pname != GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB) {
@@ -177,7 +177,7 @@ get_attrib_array_data(__GLXattribute * state, GLuint index, GLenum cap,
 
 
 static void
-get_vertex_attrib(__GLXcontext * gc, unsigned vop,
+get_vertex_attrib(struct glx_context * gc, unsigned vop,
                   GLuint index, GLenum pname, xReply * reply)
 {
    Display *const dpy = gc->currentDpy;
@@ -193,9 +193,9 @@ get_vertex_attrib(__GLXcontext * gc, unsigned vop,
 
 
 void
-__indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params)
+__indirect_glGetVertexAttribiv(GLuint index, GLenum pname, GLint * params)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
    Display *const dpy = gc->currentDpy;
    __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
    xGLXSingleReply reply;
@@ -226,10 +226,10 @@ __indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params)
 
 
 void
-__indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname,
+__indirect_glGetVertexAttribfv(GLuint index, GLenum pname,
                                   GLfloat * params)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
    Display *const dpy = gc->currentDpy;
    __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
    xGLXSingleReply reply;
@@ -260,10 +260,10 @@ __indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname,
 
 
 void
-__indirect_glGetVertexAttribdvARB(GLuint index, GLenum pname,
+__indirect_glGetVertexAttribdv(GLuint index, GLenum pname,
                                   GLdouble * params)
 {
-   __GLXcontext *const gc = __glXGetCurrentContext();
+   struct glx_context *const gc = __glXGetCurrentContext();
    Display *const dpy = gc->currentDpy;
    __GLXattribute *state = (__GLXattribute *) (gc->client_state_private);
    xGLXSingleReply reply;