diff options
| author | Brian Paul <[email protected]> | 2006-04-25 00:53:25 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-04-25 00:53:25 +0000 |
| commit | 94b30dc390f1fdd526c080080830016fad3e2ee2 (patch) | |
| tree | 92643c41eae15bcf373a9777ca04e73cfe46c7c3 /src/mesa/tnl/t_vtx_exec.c | |
| parent | 5bdc6fdebc0ab59a888fba15136eb4a0ee2790e1 (diff) | |
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.
Diffstat (limited to 'src/mesa/tnl/t_vtx_exec.c')
| -rw-r--r-- | src/mesa/tnl/t_vtx_exec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_vtx_exec.c b/src/mesa/tnl/t_vtx_exec.c index 3705a5c96a9..57d842f05fe 100644 --- a/src/mesa/tnl/t_vtx_exec.c +++ b/src/mesa/tnl/t_vtx_exec.c @@ -129,7 +129,7 @@ static void _tnl_vb_bind_vtx( GLcontext *ctx ) VB->Elts = NULL; VB->NormalLengthPtr = NULL; - for (attr = 0; attr <= _TNL_ATTRIB_INDEX ; attr++) { + for (attr = 0; attr <= _TNL_ATTRIB_EDGEFLAG ; attr++) { if (tnl->vtx.attrsz[attr]) { tmp->Attribs[attr].count = count; tmp->Attribs[attr].data = (GLfloat (*)[4]) data; @@ -171,10 +171,10 @@ static void _tnl_vb_bind_vtx( GLcontext *ctx ) VB->NormalPtr = VB->AttribPtr[_TNL_ATTRIB_NORMAL]; VB->ColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR0]; VB->ColorPtr[1] = NULL; - VB->IndexPtr[0] = VB->AttribPtr[_TNL_ATTRIB_INDEX]; - VB->IndexPtr[1] = NULL; VB->SecondaryColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR1]; VB->SecondaryColorPtr[1] = NULL; + VB->IndexPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR_INDEX]; + VB->IndexPtr[1] = NULL; VB->FogCoordPtr = VB->AttribPtr[_TNL_ATTRIB_FOG]; for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { |