KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure all VB->AttribPtr[] are populated. Reported by Aapo Tahkola

This commit is contained in:
Keith Whitwell 2005-04-25 09:36:27 +00:00
parent 576caad33e
commit b83aadb0e4
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mesa/tnl/t_array_import.c
View File

@ -238,6 +238,18 @@ static void _tnl_import_attrib( GLcontext *ctx,
}
static void _tnl_constant_attrib( TNLcontext *tnl,
struct tnl_vertex_arrays *tmp,
GLuint i )
{
tmp->Attribs[i].count = 1;
tmp->Attribs[i].data = (GLfloat (*)[4]) tnl->vtx.current[i];
tmp->Attribs[i].start = tnl->vtx.current[i];
tmp->Attribs[i].size = 4;
tmp->Attribs[i].stride = 0;
tnl->vb.AttribPtr[i] = &tmp->Attribs[i];
}
void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end)
@ -299,6 +311,9 @@ void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end)
VB->AttribPtr[_TNL_ATTRIB_TEX0 + i] = &tmp->TexCoord[i];
}
}
else {
_tnl_constant_attrib(tnl, tmp, index);
}
}
/* odd-ball vertex attributes */
@ -313,16 +328,11 @@ void _tnl_vb_bind_arrays( GLcontext *ctx, GLint start, GLint end)
VB->EdgeFlag = (GLboolean *) tmp->EdgeFlag;
}
/* These are constant & can be precalculated:
/* These are constant & could be precalculated:
*/
for (i = _TNL_ATTRIB_MAT_FRONT_AMBIENT; i < _TNL_ATTRIB_INDEX; i++) {
tmp->Attribs[i].count = 1;
tmp->Attribs[i].data = (GLfloat (*)[4]) tnl->vtx.current[i];
tmp->Attribs[i].start = tnl->vtx.current[i];
tmp->Attribs[i].size = 4;
tmp->Attribs[i].stride = 0;
VB->AttribPtr[i] = &tmp->Attribs[i];
}
_tnl_constant_attrib(tnl, tmp, i);
}
/* Legacy pointers -- remove one day.