Simplify last fix slightly, apply to vtx paths as well.
This commit is contained in:
@@ -503,10 +503,7 @@ static void _save_upgrade_vertex( GLcontext *ctx,
|
|||||||
dest += newsz;
|
dest += newsz;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
GLuint currentsz = tnl->save.currentsz[attr][0];
|
COPY_SZ_4V( dest, newsz, tnl->save.current[attr] );
|
||||||
GLfloat *current = tnl->save.current[attr];
|
|
||||||
ASSIGN_4V( dest, 0, 0, 0, 1 );
|
|
||||||
COPY_SZ_4V( dest, currentsz, current );
|
|
||||||
dest += newsz;
|
dest += newsz;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -275,10 +275,15 @@ static void _tnl_wrap_upgrade_vertex( GLcontext *ctx,
|
|||||||
for (j = 0 ; j < _TNL_ATTRIB_MAX ; j++) {
|
for (j = 0 ; j < _TNL_ATTRIB_MAX ; j++) {
|
||||||
if (tnl->vtx.attrsz[j]) {
|
if (tnl->vtx.attrsz[j]) {
|
||||||
if (j == attr) {
|
if (j == attr) {
|
||||||
COPY_SZ_4V( dest, newsz, tnl->vtx.current[j] );
|
if (oldsz) {
|
||||||
COPY_SZ_4V( dest, oldsz, data );
|
ASSIGN_4V( dest, 0, 0, 0, 1 );
|
||||||
data += oldsz;
|
COPY_SZ_4V( dest, oldsz, data );
|
||||||
dest += newsz;
|
data += oldsz;
|
||||||
|
dest += newsz;
|
||||||
|
} else {
|
||||||
|
COPY_SZ_4V( dest, newsz, tnl->vtx.current[j] );
|
||||||
|
dest += newsz;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
GLuint sz = tnl->vtx.attrsz[j];
|
GLuint sz = tnl->vtx.attrsz[j];
|
||||||
|
Reference in New Issue
Block a user