use COPY_CLEAN_4V macro to replace using both ASSIGN_4V & COPY_SZ_4V
This commit is contained in:
parent
b960c14cbb
commit
fff3b2f318
|
@ -371,8 +371,7 @@ static void _save_copy_to_current( GLcontext *ctx )
|
|||
for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) {
|
||||
if (tnl->save.attrsz[i]) {
|
||||
tnl->save.currentsz[i][0] = tnl->save.attrsz[i];
|
||||
ASSIGN_4V(tnl->save.current[i], 0, 0, 0, 1);
|
||||
COPY_SZ_4V(tnl->save.current[i],
|
||||
COPY_CLEAN_4V(tnl->save.current[i],
|
||||
tnl->save.attrsz[i],
|
||||
tnl->save.attrptr[i]);
|
||||
}
|
||||
|
@ -502,8 +501,7 @@ static void _save_upgrade_vertex( GLcontext *ctx,
|
|||
if (tnl->save.attrsz[j]) {
|
||||
if (j == attr) {
|
||||
if (oldsz) {
|
||||
ASSIGN_4V( dest, 0, 0, 0, 1 );
|
||||
COPY_SZ_4V( dest, oldsz, data );
|
||||
COPY_CLEAN_4V( dest, oldsz, data );
|
||||
data += oldsz;
|
||||
dest += newsz;
|
||||
}
|
||||
|
|
|
@ -131,8 +131,7 @@ static void _playback_copy_to_current( GLcontext *ctx,
|
|||
|
||||
for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) {
|
||||
if (node->attrsz[i]) {
|
||||
ASSIGN_4V(tnl->vtx.current[i], 0, 0, 0, 1);
|
||||
COPY_SZ_4V(tnl->vtx.current[i], node->attrsz[i], data);
|
||||
COPY_CLEAN_4V(tnl->vtx.current[i], node->attrsz[i], data);
|
||||
data += node->attrsz[i];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -133,8 +133,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
|
|||
const GLuint size = VB->AttribPtr[attr]->size;
|
||||
const GLuint stride = VB->AttribPtr[attr]->stride;
|
||||
const GLfloat *data = (GLfloat *) (ptr + stride * i);
|
||||
ASSIGN_4V(ctx->VertexProgram.Inputs[attr], 0, 0, 0, 1);
|
||||
COPY_SZ_4V(ctx->VertexProgram.Inputs[attr], size, data);
|
||||
COPY_CLEAN_4V(ctx->VertexProgram.Inputs[attr], size, data);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -147,8 +147,7 @@ static void _tnl_copy_to_current( GLcontext *ctx )
|
|||
/* Note: the tnl->vtx.current[i] pointers points to
|
||||
* the ctx->Current fields. The first 16 or so, anyway.
|
||||
*/
|
||||
ASSIGN_4V( tnl->vtx.current[i], 0, 0, 0, 1 );
|
||||
COPY_SZ_4V(tnl->vtx.current[i],
|
||||
COPY_CLEAN_4V(tnl->vtx.current[i],
|
||||
tnl->vtx.attrsz[i],
|
||||
tnl->vtx.attrptr[i]);
|
||||
}
|
||||
|
@ -278,8 +277,7 @@ static void _tnl_wrap_upgrade_vertex( GLcontext *ctx,
|
|||
if (tnl->vtx.attrsz[j]) {
|
||||
if (j == attr) {
|
||||
if (oldsz) {
|
||||
ASSIGN_4V( dest, 0, 0, 0, 1 );
|
||||
COPY_SZ_4V( dest, oldsz, data );
|
||||
COPY_CLEAN_4V( dest, oldsz, data );
|
||||
data += oldsz;
|
||||
dest += newsz;
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue