diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-25 00:53:25 +0000 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-04-25 00:53:25 +0000 |
commit | 94b30dc390f1fdd526c080080830016fad3e2ee2 (patch) | |
tree | 92643c41eae15bcf373a9777ca04e73cfe46c7c3 /src/mesa/tnl/t_save_playback.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_save_playback.c')
-rw-r--r-- | src/mesa/tnl/t_save_playback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_save_playback.c b/src/mesa/tnl/t_save_playback.c index 995964c961..9504f0fe68 100644 --- a/src/mesa/tnl/t_save_playback.c +++ b/src/mesa/tnl/t_save_playback.c @@ -66,7 +66,7 @@ static void _tnl_bind_vertex_list( GLcontext *ctx, VB->Elts = NULL; VB->NormalLengthPtr = node->normal_lengths; - for (attr = 0; attr <= _TNL_ATTRIB_INDEX; attr++) { + for (attr = 0; attr <= _TNL_ATTRIB_EDGEFLAG; attr++) { if (node->attrsz[attr]) { tmp->Attribs[attr].count = node->count; tmp->Attribs[attr].data = (GLfloat (*)[4]) data; @@ -106,7 +106,7 @@ static void _tnl_bind_vertex_list( 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[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR_INDEX]; VB->IndexPtr[1] = NULL; VB->SecondaryColorPtr[0] = VB->AttribPtr[_TNL_ATTRIB_COLOR1]; VB->SecondaryColorPtr[1] = NULL; @@ -129,7 +129,7 @@ static void _playback_copy_to_current( GLcontext *ctx, else data = node->buffer; - for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) { + for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_EDGEFLAG ; i++) { if (node->attrsz[i]) { COPY_CLEAN_4V(tnl->vtx.current[i], node->attrsz[i], data); data += node->attrsz[i]; |