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_save_loopback.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_loopback.c')
| -rw-r--r-- | src/mesa/tnl/t_save_loopback.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/mesa/tnl/t_save_loopback.c b/src/mesa/tnl/t_save_loopback.c index 7b2e4a43203..9d87c20df84 100644 --- a/src/mesa/tnl/t_save_loopback.c +++ b/src/mesa/tnl/t_save_loopback.c @@ -297,7 +297,8 @@ void _tnl_loopback_vertex_list( GLcontext *ctx, struct loopback_attr la[_TNL_ATTRIB_MAX]; GLuint i, nr = 0; - for (i = 0 ; i <= _TNL_ATTRIB_TEX7 ; i++) { + /* conventional + generic attributes */ + for (i = 0 ; i <= _TNL_ATTRIB_ATTRIBUTE15 ; i++) { if (list->attrsz[i]) { la[nr].target = i; la[nr].sz = list->attrsz[i]; @@ -306,6 +307,7 @@ void _tnl_loopback_vertex_list( GLcontext *ctx, } } + /* material attributes */ for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT ; i <= _TNL_ATTRIB_MAT_BACK_INDEXES ; i++) { @@ -317,6 +319,7 @@ void _tnl_loopback_vertex_list( GLcontext *ctx, } } + /* special-case: edgeflag */ if (list->attrsz[_TNL_ATTRIB_EDGEFLAG]) { la[nr].target = _TNL_ATTRIB_EDGEFLAG; la[nr].sz = list->attrsz[_TNL_ATTRIB_EDGEFLAG]; @@ -324,15 +327,6 @@ void _tnl_loopback_vertex_list( GLcontext *ctx, nr++; } - if (list->attrsz[_TNL_ATTRIB_INDEX]) { - la[nr].target = _TNL_ATTRIB_INDEX; - la[nr].sz = list->attrsz[_TNL_ATTRIB_INDEX]; - la[nr].func = index_attr1fv; - nr++; - } - - /* XXX ARB vertex attribs */ - for (i = 0 ; i < list->prim_count ; i++) { if (list->prim[i].mode & PRIM_WEAK) loopback_weak_prim( ctx, list, i, la, nr ); |