SWvertex no longer has texcoord field, use attrib field instead

diff --git a/src/mesa/tnl_dd/t_dd_vb.c b/src/mesa/tnl_dd/t_dd_vb.c
index edd78f7acfc75d7d9a7103ab3ac04c36d9cf6592..629f328a4d17b42952da9d77b2d0710c14735a4a 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_vb.c
+++ b/src/mesa/tnl_dd/t_dd_vb.c
@@ -141,45 +141,45 @@ void TAG(translate_vertex)(GLcontext *ctx,
          ((HAVE_TEX2_VERTICES && format == PROJ_TEX3_VERTEX_FORMAT) ||
           (format == PROJ_TEX1_VERTEX_FORMAT))) {
 
-        dst->texcoord[0][0] = src->pv.u0;
-        dst->texcoord[0][1] = src->pv.v0;
-        dst->texcoord[0][3] = src->pv.q0;
+        dst->attrib[FRAG_ATTRIB_TEX0][0] = src->pv.u0;
+        dst->attrib[FRAG_ATTRIB_TEX0][1] = src->pv.v0;
+        dst->attrib[FRAG_ATTRIB_TEX0][3] = src->pv.q0;
 
-        dst->texcoord[1][0] = src->pv.u1;
-        dst->texcoord[1][1] = src->pv.v1;
-        dst->texcoord[1][3] = src->pv.q1;
+        dst->attrib[FRAG_ATTRIB_TEX1][0] = src->pv.u1;
+        dst->attrib[FRAG_ATTRIB_TEX1][1] = src->pv.v1;
+        dst->attrib[FRAG_ATTRIB_TEX1][3] = src->pv.q1;
 
         if (HAVE_TEX2_VERTICES) {
-           dst->texcoord[2][0] = src->pv.u2;
-           dst->texcoord[2][1] = src->pv.v2;
-           dst->texcoord[2][3] = src->pv.q2;
+           dst->attrib[FRAG_ATTRIB_TEX2][0] = src->pv.u2;
+           dst->attrib[FRAG_ATTRIB_TEX2][1] = src->pv.v2;
+           dst->attrib[FRAG_ATTRIB_TEX2][3] = src->pv.q2;
         }
 
         if (HAVE_TEX3_VERTICES) {
-           dst->texcoord[3][0] = src->pv.u3;
-           dst->texcoord[3][1] = src->pv.v3;
-           dst->texcoord[3][3] = src->pv.q3;
+           dst->attrib[FRAG_ATTRIB_TEX3][0] = src->pv.u3;
+           dst->attrib[FRAG_ATTRIB_TEX3][1] = src->pv.v3;
+           dst->attrib[FRAG_ATTRIB_TEX3][3] = src->pv.q3;
         }
       }
       else {
-        dst->texcoord[0][0] = src->v.u0;
-        dst->texcoord[0][1] = src->v.v0;
-        dst->texcoord[0][3] = 1.0;
+        dst->attrib[FRAG_ATTRIB_TEX0][0] = src->v.u0;
+        dst->attrib[FRAG_ATTRIB_TEX0][1] = src->v.v0;
+        dst->attrib[FRAG_ATTRIB_TEX0][3] = 1.0;
 
-        dst->texcoord[1][0] = src->v.u1;
-        dst->texcoord[1][1] = src->v.v1;
-        dst->texcoord[1][3] = 1.0;
+        dst->attrib[FRAG_ATTRIB_TEX1][0] = src->v.u1;
+        dst->attrib[FRAG_ATTRIB_TEX1][1] = src->v.v1;
+        dst->attrib[FRAG_ATTRIB_TEX1][3] = 1.0;
 
         if (HAVE_TEX2_VERTICES) {
-           dst->texcoord[2][0] = src->v.u2;
-           dst->texcoord[2][1] = src->v.v2;
-           dst->texcoord[2][3] = 1.0;
+           dst->attrib[FRAG_ATTRIB_TEX2][0] = src->v.u2;
+           dst->attrib[FRAG_ATTRIB_TEX2][1] = src->v.v2;
+           dst->attrib[FRAG_ATTRIB_TEX2][3] = 1.0;
         }
 
         if (HAVE_TEX3_VERTICES) {
-           dst->texcoord[3][0] = src->v.u3;
-           dst->texcoord[3][1] = src->v.v3;
-           dst->texcoord[3][3] = 1.0;
+           dst->attrib[FRAG_ATTRIB_TEX3][0] = src->v.u3;
+           dst->attrib[FRAG_ATTRIB_TEX3][1] = src->v.v3;
+           dst->attrib[FRAG_ATTRIB_TEX3][3] = 1.0;
         }
       }
    }