use COPY_CLEAN_4V macro to replace using both ASSIGN_4V & COPY_SZ_4V

diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c
index 684263660a7f747fd7cf63f5fb2cb9e6d9788cfe..28bd376fc0801b69c3e27bbc965fb003cd2a4c7e 100644 (file)
--- a/src/mesa/tnl/t_save_api.c
+++ b/src/mesa/tnl/t_save_api.c
@@ -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;
                  }

diff --git a/src/mesa/tnl/t_save_playback.c b/src/mesa/tnl/t_save_playback.c
index fa094b10a2152df10d07c5ad95704fce3daa25d1..c271ba749cf233703302a8fcc326cf6b647570ad 100644 (file)
--- a/src/mesa/tnl/t_save_playback.c
+++ b/src/mesa/tnl/t_save_playback.c
@@ -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];
       }
    }

diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 520775412e8122ecc8e65e292169944d99338b5b..614d537c30e5a1690e9590177143d0d7c55e9074 100644 (file)
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -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);
         }
       }
 

diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c
index 1ba0f468ce99f8a3c766cd5e1f04d19e05b159ac..fabd99e5d097f28cf83c7b6108c10fec47376941 100644 (file)
--- a/src/mesa/tnl/t_vtx_api.c
+++ b/src/mesa/tnl/t_vtx_api.c
@@ -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 {