fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 00:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

When upgrading copied vertices, distinguish between an attribute

Browse source 
entering a vertex for the first time and one which was already present
but increasing its size.  Fixes Brian's normal.c bug.
This commit is contained in:
Keith Whitwell 2004-04-20 10:18:33 +00:00
parent 8be72c5b5d
commit 30a8a0b8fa
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/mesa/tnl/t_save_api.c
View file

@ -473,7 +473,7 @@ static void _save_upgrade_vertex( GLcontext *ctx,
/* Need to note this and fix up at runtime (or loopback):
*/
if (tnl->save.currentsz[attr] == 0) {
if (tnl->save.currentsz[attr][0] == 0) {
assert(oldsz == 0);
tnl->save.dangling_attr_ref = GL_TRUE;
_mesa_debug(0, "_save_upgrade_vertex: dangling reference attr %d\n",
@ -496,10 +496,19 @@ static void _save_upgrade_vertex( GLcontext *ctx,
for (j = 0 ; j < _TNL_ATTRIB_MAX ; j++) {
if (tnl->save.attrsz[j]) {
if (j == attr) {
ASSIGN_4V( dest, 0, 0, 0, 1 );
COPY_SZ_4V( dest, oldsz, data );
data += oldsz;
dest += newsz;
if (oldsz) {
ASSIGN_4V( dest, 0, 0, 0, 1 );
COPY_SZ_4V( dest, oldsz, data );
data += oldsz;
dest += newsz;
}
else {
GLuint currentsz = tnl->save.currentsz[attr][0];
GLfloat *current = tnl->save.current[attr];
ASSIGN_4V( dest, 0, 0, 0, 1 );
COPY_SZ_4V( dest, currentsz, current );
dest += newsz;
}
}
else {
GLint sz = tnl->save.attrsz[j];