X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fvtxfmt_tmp.h;h=6f5d01e40f2d9ad8e5e4ebf2f1584645456e401c;hb=06cd826fcba7bde168a85444a95de589ff5b6f2e;hp=1f6c7671e3fb86b198ff67fd75072b955f9a8ace;hpb=b1b403665635350df3f30db992faf50776606545;p=mesa.git

diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index 1f6c7671e3f..6f5d01e40f2 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -1,10 +1,8 @@
-/* $Id: vtxfmt_tmp.h,v 1.2 2001/03/10 02:50:42 gareth Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.3
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,372 +21,436 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
- * Author:
- *    Gareth Hughes <gareth@valinux.com>
+ * Authors:
+ *    Gareth Hughes
  */
 
 #ifndef PRE_LOOPBACK
 #define PRE_LOOPBACK( FUNC )
 #endif
 
-static void TAG(ArrayElement)( GLint i )
+#include "glapi/dispatch.h"
+#include "glapi/glapioffsets.h"
+
+static void GLAPIENTRY TAG(ArrayElement)( GLint i )
 {
    PRE_LOOPBACK( ArrayElement );
-   glArrayElement( i );
+   CALL_ArrayElement(GET_DISPATCH(), ( i ));
 }
 
-static void TAG(Color3f)( GLfloat a, GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(Color3f)( GLfloat r, GLfloat g, GLfloat b )
 {
    PRE_LOOPBACK( Color3f );
-   glColor3f( a, b, c );
+   CALL_Color3f(GET_DISPATCH(), ( r, g, b ));
 }
 
-static void TAG(Color3fv)( const GLfloat *v )
+static void GLAPIENTRY TAG(Color3fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Color3fv );
-   glColor3fv( v );
-}
-
-static void TAG(Color3ub)( GLubyte a, GLubyte b, GLubyte c )
-{
-   PRE_LOOPBACK( Color3ub );
-   glColor3ub( a, b, c );
+   CALL_Color3fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Color3ubv)( const GLubyte *v )
-{
-   PRE_LOOPBACK( Color3ubv );
-   glColor3ubv( v );
-}
-
-static void TAG(Color4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+static void GLAPIENTRY TAG(Color4f)( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
 {
    PRE_LOOPBACK( Color4f );
-   glColor4f( a, b, c, d );
+   CALL_Color4f(GET_DISPATCH(), ( r, g, b, a ));
 }
 
-static void TAG(Color4fv)( const GLfloat *v )
+static void GLAPIENTRY TAG(Color4fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Color4fv );
-   glColor4fv( v );
+   CALL_Color4fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Color4ub)( GLubyte a, GLubyte b, GLubyte c, GLubyte d )
-{
-   PRE_LOOPBACK( Color4ub );
-   glColor4ub( a, b, c, d );
-}
-
-static void TAG(Color4ubv)( const GLubyte *v )
-{
-   PRE_LOOPBACK( Color4ubv );
-   glColor4ubv( v );
-}
-
-static void TAG(EdgeFlag)( GLboolean a )
+static void GLAPIENTRY TAG(EdgeFlag)( GLboolean e )
 {
    PRE_LOOPBACK( EdgeFlag );
-   glEdgeFlag( a );
+   CALL_EdgeFlag(GET_DISPATCH(), ( e ));
 }
 
-static void TAG(EdgeFlagv)( const GLboolean *v )
-{
-   PRE_LOOPBACK( EdgeFlagv );
-   glEdgeFlagv( v );
-}
-
-static void TAG(EvalCoord1f)( GLfloat a )
+static void GLAPIENTRY TAG(EvalCoord1f)( GLfloat s )
 {
    PRE_LOOPBACK( EvalCoord1f );
-   glEvalCoord1f( a );
+   CALL_EvalCoord1f(GET_DISPATCH(), ( s ));
 }
 
-static void TAG(EvalCoord1fv)( const GLfloat *v )
+static void GLAPIENTRY TAG(EvalCoord1fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( EvalCoord1fv );
-   glEvalCoord1fv( v );
+   CALL_EvalCoord1fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(EvalCoord2f)( GLfloat a, GLfloat b )
+static void GLAPIENTRY TAG(EvalCoord2f)( GLfloat s, GLfloat t )
 {
    PRE_LOOPBACK( EvalCoord2f );
-   glEvalCoord2f( a, b );
+   CALL_EvalCoord2f(GET_DISPATCH(), ( s, t ));
 }
 
-static void TAG(EvalCoord2fv)( const GLfloat *v )
+static void GLAPIENTRY TAG(EvalCoord2fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( EvalCoord2fv );
-   glEvalCoord2fv( v );
+   CALL_EvalCoord2fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(EvalPoint1)( GLint a )
+static void GLAPIENTRY TAG(EvalPoint1)( GLint i )
 {
    PRE_LOOPBACK( EvalPoint1 );
-   glEvalPoint1( a );
+   CALL_EvalPoint1(GET_DISPATCH(), ( i ));
 }
 
-static void TAG(EvalPoint2)( GLint a, GLint b )
+static void GLAPIENTRY TAG(EvalPoint2)( GLint i, GLint j )
 {
    PRE_LOOPBACK( EvalPoint2 );
-   glEvalPoint2( a, b );
+   CALL_EvalPoint2(GET_DISPATCH(), ( i, j ));
 }
 
-static void TAG(FogCoordfEXT)( GLfloat a )
+static void GLAPIENTRY TAG(FogCoordfEXT)( GLfloat f )
 {
    PRE_LOOPBACK( FogCoordfEXT );
-   glFogCordfEXT( a );
+   CALL_FogCoordfEXT(GET_DISPATCH(), ( f ));
 }
 
-static void TAG(FogCoordfvEXT)( const GLfloat *v )
+static void GLAPIENTRY TAG(FogCoordfvEXT)( const GLfloat *v )
 {
    PRE_LOOPBACK( FogCoordfvEXT );
-   glFogCoordfvEXT( v );
+   CALL_FogCoordfvEXT(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Indexi)( GLint a )
+static void GLAPIENTRY TAG(Indexf)( GLfloat f )
 {
-   PRE_LOOPBACK( Indexi );
-   glIndexi( a );
+   PRE_LOOPBACK( Indexf );
+   CALL_Indexf(GET_DISPATCH(), ( f ));
 }
 
-static void TAG(Indexiv)( const GLint *v )
+static void GLAPIENTRY TAG(Indexfv)( const GLfloat *v )
 {
-   PRE_LOOPBACK( Indexiv );
-   glIndexiv( v );
+   PRE_LOOPBACK( Indexfv );
+   CALL_Indexfv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
+static void GLAPIENTRY TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
 {
    PRE_LOOPBACK( Materialfv );
-   glMaterialfv( face, pname, v );
+   CALL_Materialfv(GET_DISPATCH(), ( face, pname, v ));
 }
 
-static void TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
+static void GLAPIENTRY TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
 {
    PRE_LOOPBACK( MultiTexCoord1fARB );
-   glMultiTexCoord1fARB( target, a );
+   CALL_MultiTexCoord1fARB(GET_DISPATCH(), ( target, a ));
 }
 
-static void TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
+static void GLAPIENTRY TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
 {
    PRE_LOOPBACK( MultiTexCoord1fvARB );
-   glMultiTexCoord1fvARB( target, tc );
+   CALL_MultiTexCoord1fvARB(GET_DISPATCH(), ( target, tc ));
 }
 
-static void TAG(MultiTexCoord2fARB)( GLenum target, GLfloat a, GLfloat b )
+static void GLAPIENTRY TAG(MultiTexCoord2fARB)( GLenum target, GLfloat s, GLfloat t )
 {
    PRE_LOOPBACK( MultiTexCoord2fARB );
-   glMultiTexCoord2fARB( target, a, b );
+   CALL_MultiTexCoord2fARB(GET_DISPATCH(), ( target, s, t ));
 }
 
-static void TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
+static void GLAPIENTRY TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
 {
    PRE_LOOPBACK( MultiTexCoord2fvARB );
-   glMultiTexCoord2fvARB( target, tc );
+   CALL_MultiTexCoord2fvARB(GET_DISPATCH(), ( target, tc ));
 }
 
-static void TAG(MultiTexCoord3fARB)( GLenum target, GLfloat a,
-				     GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(MultiTexCoord3fARB)( GLenum target, GLfloat s,
+				     GLfloat t, GLfloat r )
 {
    PRE_LOOPBACK( MultiTexCoord3fARB );
-   glMultiTexCoord3fARB( target, a, b, c );
+   CALL_MultiTexCoord3fARB(GET_DISPATCH(), ( target, s, t, r ));
 }
 
-static void TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
+static void GLAPIENTRY TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
 {
    PRE_LOOPBACK( MultiTexCoord3fvARB );
-   glMultiTexCoord3fvARB( target, tc );
+   CALL_MultiTexCoord3fvARB(GET_DISPATCH(), ( target, tc ));
 }
 
-static void TAG(MultiTexCoord4fARB)( GLenum target, GLfloat a,
-				     GLfloat b, GLfloat c, GLfloat d )
+static void GLAPIENTRY TAG(MultiTexCoord4fARB)( GLenum target, GLfloat s,
+				     GLfloat t, GLfloat r, GLfloat q )
 {
    PRE_LOOPBACK( MultiTexCoord4fARB );
-   glMultiTexCoord4fARB( target, a, b, c, d );
+   CALL_MultiTexCoord4fARB(GET_DISPATCH(), ( target, s, t, r, q ));
 }
 
-static void TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
+static void GLAPIENTRY TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
 {
    PRE_LOOPBACK( MultiTexCoord4fvARB );
-   glMultiTexCoord4fvARB( target, tc );
+   CALL_MultiTexCoord4fvARB(GET_DISPATCH(), ( target, tc ));
 }
 
-static void TAG(Normal3f)( GLfloat a, GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(Normal3f)( GLfloat x, GLfloat y, GLfloat z )
 {
    PRE_LOOPBACK( Normal3f );
-   glNormal3f( a, b, c );
+   CALL_Normal3f(GET_DISPATCH(), ( x, y, z ));
 }
 
-static void TAG(Normal3fv)( const GLfloat *v )
+static void GLAPIENTRY TAG(Normal3fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Normal3fv );
-   glNormal3fv( v );
+   CALL_Normal3fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(SecondaryColor3fEXT)( GLfloat a, GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(SecondaryColor3fEXT)( GLfloat r, GLfloat g, GLfloat b )
 {
    PRE_LOOPBACK( SecondaryColor3fEXT );
-   glSecondaryColor3fEXT( a, b, c );
+   CALL_SecondaryColor3fEXT(GET_DISPATCH(), ( r, g, b ));
 }
 
-static void TAG(SecondaryColor3fvEXT)( const GLfloat *v )
+static void GLAPIENTRY TAG(SecondaryColor3fvEXT)( const GLfloat *v )
 {
    PRE_LOOPBACK( SecondaryColor3fvEXT );
-   glSecondaryColor3fvEXT( v );
-}
-
-static void TAG(SecondaryColor3ubEXT)( GLubyte a, GLubyte b, GLubyte c )
-{
-   PRE_LOOPBACK( SecondaryColor3ubEXT );
-   glSecondaryColor3ubEXT( a, b, c );
+   CALL_SecondaryColor3fvEXT(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(SecondaryColor3ubvEXT)( const GLubyte *v )
-{
-   PRE_LOOPBACK( SecondaryColor3ubvEXT );
-   glSecondaryColor3ubvEXT( v );
-}
-
-static void TAG(TexCoord1f)( GLfloat a )
+static void GLAPIENTRY TAG(TexCoord1f)( GLfloat s )
 {
    PRE_LOOPBACK( TexCoord1f );
-   glTexCoord1f( a );
+   CALL_TexCoord1f(GET_DISPATCH(), ( s ));
 }
 
-static void TAG(TexCoord1fv)( const GLfloat *tc )
+static void GLAPIENTRY TAG(TexCoord1fv)( const GLfloat *tc )
 {
    PRE_LOOPBACK( TexCoord1fv );
-   glTexCoord1fv( tc );
+   CALL_TexCoord1fv(GET_DISPATCH(), ( tc ));
 }
 
-static void TAG(TexCoord2f)( GLfloat a, GLfloat b )
+static void GLAPIENTRY TAG(TexCoord2f)( GLfloat s, GLfloat t )
 {
    PRE_LOOPBACK( TexCoord2f );
-   glTexCoord2f( a, b );
+   CALL_TexCoord2f(GET_DISPATCH(), ( s, t ));
 }
 
-static void TAG(TexCoord2fv)( const GLfloat *tc )
+static void GLAPIENTRY TAG(TexCoord2fv)( const GLfloat *tc )
 {
    PRE_LOOPBACK( TexCoord2fv );
-   glTexCoord2fv( tc );
+   CALL_TexCoord2fv(GET_DISPATCH(), ( tc ));
 }
 
-static void TAG(TexCoord3f)( GLfloat a, GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(TexCoord3f)( GLfloat s, GLfloat t, GLfloat r )
 {
    PRE_LOOPBACK( TexCoord3f );
-   glTexCoord3f( a, b, c );
+   CALL_TexCoord3f(GET_DISPATCH(), ( s, t, r ));
 }
 
-static void TAG(TexCoord3fv)( const GLfloat *tc )
+static void GLAPIENTRY TAG(TexCoord3fv)( const GLfloat *tc )
 {
    PRE_LOOPBACK( TexCoord3fv );
-   glTexCoord3fv( tc );
+   CALL_TexCoord3fv(GET_DISPATCH(), ( tc ));
 }
 
-static void TAG(TexCoord4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+static void GLAPIENTRY TAG(TexCoord4f)( GLfloat s, GLfloat t, GLfloat r, GLfloat q )
 {
    PRE_LOOPBACK( TexCoord4f );
-   glTexCoord4f( a, b, c, d );
+   CALL_TexCoord4f(GET_DISPATCH(), ( s, t, r, q ));
 }
 
-static void TAG(TexCoord4fv)( const GLfloat *tc )
+static void GLAPIENTRY TAG(TexCoord4fv)( const GLfloat *tc )
 {
    PRE_LOOPBACK( TexCoord4fv );
-   glTexCoord4fv( tc );
+   CALL_TexCoord4fv(GET_DISPATCH(), ( tc ));
 }
 
-static void TAG(Vertex2f)( GLfloat a, GLfloat b )
+static void GLAPIENTRY TAG(Vertex2f)( GLfloat x, GLfloat y )
 {
    PRE_LOOPBACK( Vertex2f );
-   glVertex2f( a, b );
+   CALL_Vertex2f(GET_DISPATCH(), ( x, y ));
 }
 
-static void TAG(Vertex2fv)( const GLfloat *obj )
+static void GLAPIENTRY TAG(Vertex2fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Vertex2fv );
-   glVertex2fv( obj );
+   CALL_Vertex2fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Vertex3f)( GLfloat a, GLfloat b, GLfloat c )
+static void GLAPIENTRY TAG(Vertex3f)( GLfloat x, GLfloat y, GLfloat z )
 {
    PRE_LOOPBACK( Vertex3f );
-   glVertex3f( a, b, c );
+   CALL_Vertex3f(GET_DISPATCH(), ( x, y, z ));
 }
 
-static void TAG(Vertex3fv)( const GLfloat *obj )
+static void GLAPIENTRY TAG(Vertex3fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Vertex3fv );
-   glVertex3fv( obj );
+   CALL_Vertex3fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(Vertex4f)( GLfloat a, GLfloat b, GLfloat c, GLfloat d )
+static void GLAPIENTRY TAG(Vertex4f)( GLfloat x, GLfloat y, GLfloat z, GLfloat w )
 {
    PRE_LOOPBACK( Vertex4f );
-   glVertex4f( a, b, c, d );
+   CALL_Vertex4f(GET_DISPATCH(), ( x, y, z, w ));
 }
 
-static void TAG(Vertex4fv)( const GLfloat *obj )
+static void GLAPIENTRY TAG(Vertex4fv)( const GLfloat *v )
 {
    PRE_LOOPBACK( Vertex4fv );
-   glVertex4fv( obj );
+   CALL_Vertex4fv(GET_DISPATCH(), ( v ));
 }
 
-static void TAG(CallList)( GLuint i )
+static void GLAPIENTRY TAG(CallList)( GLuint i )
 {
    PRE_LOOPBACK( CallList );
-   glCallList( i );
+   CALL_CallList(GET_DISPATCH(), ( i ));
+}
+
+static void GLAPIENTRY TAG(CallLists)( GLsizei sz, GLenum type, const GLvoid *v )
+{
+   PRE_LOOPBACK( CallLists );
+   CALL_CallLists(GET_DISPATCH(), ( sz, type, v ));
 }
 
-static void TAG(Begin)( GLenum mode )
+static void GLAPIENTRY TAG(Begin)( GLenum mode )
 {
    PRE_LOOPBACK( Begin );
-   glBegin( mode );
+   CALL_Begin(GET_DISPATCH(), ( mode ));
 }
 
-static void TAG(End)( void )
+static void GLAPIENTRY TAG(End)( void )
 {
    PRE_LOOPBACK( End );
-   glEnd();
+   CALL_End(GET_DISPATCH(), ());
 }
 
-static void TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
+static void GLAPIENTRY TAG(Rectf)( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 )
 {
    PRE_LOOPBACK( Rectf );
-   glRectf( x1, y1, x2, y2 );
+   CALL_Rectf(GET_DISPATCH(), ( x1, y1, x2, y2 ));
 }
 
-static void TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
+static void GLAPIENTRY TAG(DrawArrays)( GLenum mode, GLint start, GLsizei count )
 {
    PRE_LOOPBACK( DrawArrays );
-   glDrawArrays( mode, start, count );
+   CALL_DrawArrays(GET_DISPATCH(), ( mode, start, count ));
 }
 
-static void TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
-			       const void *indices )
+static void GLAPIENTRY TAG(DrawElements)( GLenum mode, GLsizei count, GLenum type,
+			       const GLvoid *indices )
 {
    PRE_LOOPBACK( DrawElements );
-   glDrawElements( mode, count, type, indices );
+   CALL_DrawElements(GET_DISPATCH(), ( mode, count, type, indices ));
 }
 
-static void TAG(DrawRangeElements)( GLenum mode, GLuint start,
+static void GLAPIENTRY TAG(DrawRangeElements)( GLenum mode, GLuint start,
 				    GLuint end, GLsizei count,
-				    GLenum type, const void *indices )
+				    GLenum type, const GLvoid *indices )
 {
    PRE_LOOPBACK( DrawRangeElements );
-   glDrawRangeElements( mode, start, end, count, type, indices );
+   CALL_DrawRangeElements(GET_DISPATCH(), ( mode, start, end, count, type, indices ));
 }
 
-static void TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
+static void GLAPIENTRY TAG(EvalMesh1)( GLenum mode, GLint i1, GLint i2 )
 {
    PRE_LOOPBACK( EvalMesh1 );
-   glEvalMesh1( mode, i1, i2 );
+   CALL_EvalMesh1(GET_DISPATCH(), ( mode, i1, i2 ));
 }
 
-static void TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
+static void GLAPIENTRY TAG(EvalMesh2)( GLenum mode, GLint i1, GLint i2,
 			    GLint j1, GLint j2 )
 {
    PRE_LOOPBACK( EvalMesh2 );
-   glEvalMesh2( mode, i1, i2, j1, j2 );
+   CALL_EvalMesh2(GET_DISPATCH(), ( mode, i1, i2, j1, j2 ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib1fNV)( GLuint index, GLfloat x )
+{
+   PRE_LOOPBACK( VertexAttrib1fNV );
+   CALL_VertexAttrib1fNV(GET_DISPATCH(), ( index, x ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib1fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib1fvNV );
+   CALL_VertexAttrib1fvNV(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fNV)( GLuint index, GLfloat x, GLfloat y )
+{
+   PRE_LOOPBACK( VertexAttrib2fNV );
+   CALL_VertexAttrib2fNV(GET_DISPATCH(), ( index, x, y ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib2fvNV );
+   CALL_VertexAttrib2fvNV(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z )
+{
+   PRE_LOOPBACK( VertexAttrib3fNV );
+   CALL_VertexAttrib3fNV(GET_DISPATCH(), ( index, x, y, z ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib3fvNV );
+   CALL_VertexAttrib3fvNV(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fNV)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   PRE_LOOPBACK( VertexAttrib4fNV );
+   CALL_VertexAttrib4fNV(GET_DISPATCH(), ( index, x, y, z, w ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fvNV)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib4fvNV );
+   CALL_VertexAttrib4fvNV(GET_DISPATCH(), ( index, v ));
+}
+
+
+static void GLAPIENTRY TAG(VertexAttrib1fARB)( GLuint index, GLfloat x )
+{
+   PRE_LOOPBACK( VertexAttrib1fARB );
+   CALL_VertexAttrib1fARB(GET_DISPATCH(), ( index, x ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib1fvARB)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib1fvARB );
+   CALL_VertexAttrib1fvARB(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fARB)( GLuint index, GLfloat x, GLfloat y )
+{
+   PRE_LOOPBACK( VertexAttrib2fARB );
+   CALL_VertexAttrib2fARB(GET_DISPATCH(), ( index, x, y ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib2fvARB)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib2fvARB );
+   CALL_VertexAttrib2fvARB(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z )
+{
+   PRE_LOOPBACK( VertexAttrib3fARB );
+   CALL_VertexAttrib3fARB(GET_DISPATCH(), ( index, x, y, z ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib3fvARB)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib3fvARB );
+   CALL_VertexAttrib3fvARB(GET_DISPATCH(), ( index, v ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fARB)( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w )
+{
+   PRE_LOOPBACK( VertexAttrib4fARB );
+   CALL_VertexAttrib4fARB(GET_DISPATCH(), ( index, x, y, z, w ));
+}
+
+static void GLAPIENTRY TAG(VertexAttrib4fvARB)( GLuint index, const GLfloat *v )
+{
+   PRE_LOOPBACK( VertexAttrib4fvARB );
+   CALL_VertexAttrib4fvARB(GET_DISPATCH(), ( index, v ));
 }
 
 
@@ -396,14 +458,9 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(ArrayElement),
    TAG(Color3f),
    TAG(Color3fv),
-   TAG(Color3ub),
-   TAG(Color3ubv),
    TAG(Color4f),
    TAG(Color4fv),
-   TAG(Color4ub),
-   TAG(Color4ubv),
    TAG(EdgeFlag),
-   TAG(EdgeFlagv),
    TAG(EvalCoord1f),
    TAG(EvalCoord1fv),
    TAG(EvalCoord2f),
@@ -412,8 +469,8 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(EvalPoint2),
    TAG(FogCoordfEXT),
    TAG(FogCoordfvEXT),
-   TAG(Indexi),
-   TAG(Indexiv),
+   TAG(Indexf),
+   TAG(Indexfv),
    TAG(Materialfv),
    TAG(MultiTexCoord1fARB),
    TAG(MultiTexCoord1fvARB),
@@ -427,8 +484,6 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(Normal3fv),
    TAG(SecondaryColor3fEXT),
    TAG(SecondaryColor3fvEXT),
-   TAG(SecondaryColor3ubEXT),
-   TAG(SecondaryColor3ubvEXT),
    TAG(TexCoord1f),
    TAG(TexCoord1fv),
    TAG(TexCoord2f),
@@ -444,14 +499,31 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(Vertex4f),
    TAG(Vertex4fv),
    TAG(CallList),
+   TAG(CallLists),
    TAG(Begin),
    TAG(End),
+   TAG(VertexAttrib1fNV),
+   TAG(VertexAttrib1fvNV),
+   TAG(VertexAttrib2fNV),
+   TAG(VertexAttrib2fvNV),
+   TAG(VertexAttrib3fNV),
+   TAG(VertexAttrib3fvNV),
+   TAG(VertexAttrib4fNV),
+   TAG(VertexAttrib4fvNV),
+   TAG(VertexAttrib1fARB),
+   TAG(VertexAttrib1fvARB),
+   TAG(VertexAttrib2fARB),
+   TAG(VertexAttrib2fvARB),
+   TAG(VertexAttrib3fARB),
+   TAG(VertexAttrib3fvARB),
+   TAG(VertexAttrib4fARB),
+   TAG(VertexAttrib4fvARB),
    TAG(Rectf),
    TAG(DrawArrays),
    TAG(DrawElements),
    TAG(DrawRangeElements),
    TAG(EvalMesh1),
-   TAG(EvalMesh2),
+   TAG(EvalMesh2)
 };
 
 #undef TAG