Index: ./src/mesa/tnl/t_vtx_generic.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/tnl/t_vtx_generic.c,v
retrieving revision 1.7
diff -u -p -r1.7 t_vtx_generic.c
--- ./src/mesa/tnl/t_vtx_generic.c	11 Apr 2006 11:41:13 -0000	1.7
+++ ./src/mesa/tnl/t_vtx_generic.c	19 Apr 2006 12:27:59 -0000
@@ -420,60 +420,42 @@ static void GLAPIENTRY _tnl_VertexAttrib
 
 static void GLAPIENTRY _tnl_VertexAttrib1fARB( GLuint index, GLfloat x )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR1F( index, x );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib1fvARB( GLuint index, 
 					       const GLfloat *v )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR1FV( index, v );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib2fARB( GLuint index, GLfloat x, 
 					      GLfloat y )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR2F( index, x, y );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib2fvARB( GLuint index,
 					       const GLfloat *v )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR2FV( index, v );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib3fARB( GLuint index, GLfloat x,
 					      GLfloat y, GLfloat z )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR3F( index, x, y, z );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib3fvARB( GLuint index,
 					       const GLfloat *v )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR3FV( index, v );
 }
 
@@ -481,20 +463,14 @@ static void GLAPIENTRY _tnl_VertexAttrib
 					      GLfloat y, GLfloat z,
 					      GLfloat w )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR4F( index, x, y, z, w );
 }
 
 static void GLAPIENTRY _tnl_VertexAttrib4fvARB( GLuint index, 
 					       const GLfloat *v )
 {
-   if (index >= MAX_VERTEX_ATTRIBS)
-      index = ERROR_ATTRIB;
-   else
-      index += VERT_ATTRIB_GENERIC0;
+   if (index >= MAX_VERTEX_ATTRIBS) index = ERROR_ATTRIB;
    DISPATCH_ATTR4FV( index, v );
 }