Put color index attribute into the 6th attribute slot.

Update a lot of loops, conditionals to use the _TNL_FIRST/LAST_* values
instead of specific vertex attributes.
Remove the EdgeFlagv function from the GLvertexformat struct.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/mesa/tnl/t_vtx_generic.c b/src/mesa/tnl/t_vtx_generic.c
index bfae296921b..28de445ed41 100644
--- a/src/mesa/tnl/t_vtx_generic.c
+++ b/src/mesa/tnl/t_vtx_generic.c
@@ -333,6 +333,16 @@ static void GLAPIENTRY _tnl_Color4fv( const GLfloat *v )
    DISPATCH_ATTR4FV( _TNL_ATTRIB_COLOR0, v );
 }
 
+static void GLAPIENTRY _tnl_Indexf( GLfloat v )
+{
+   DISPATCH_ATTR1F( _TNL_ATTRIB_COLOR_INDEX, v );
+}
+
+static void GLAPIENTRY _tnl_Indexfv( const GLfloat *v )
+{
+   DISPATCH_ATTR1FV( _TNL_ATTRIB_COLOR_INDEX, v );
+}
+
 static void GLAPIENTRY _tnl_SecondaryColor3fEXT( GLfloat x, GLfloat y, 
 						 GLfloat z )
 {
@@ -556,6 +566,8 @@ void _tnl_generic_exec_vtxfmt_init( GLcontext *ctx )
    vfmt->Color3fv = _tnl_Color3fv;
    vfmt->Color4f = _tnl_Color4f;
    vfmt->Color4fv = _tnl_Color4fv;
+   vfmt->Indexf = _tnl_Indexf;
+   vfmt->Indexfv = _tnl_Indexfv;
    vfmt->FogCoordfEXT = _tnl_FogCoordfEXT;
    vfmt->FogCoordfvEXT = _tnl_FogCoordfvEXT;
    vfmt->MultiTexCoord1fARB = _tnl_MultiTexCoord1f;