projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'gallium-0.1' into gallium-tex-surfaces
[mesa.git] / src / mesa / tnl_dd / t_dd_vb.c
diff --git a/src/mesa/tnl_dd/t_dd_vb.c b/src/mesa/tnl_dd/t_dd_vb.c
index 380b0424b4f50ddc7ccdcab847b56437b8efec75..3cedd9011904f99d6a21d2d4545c21034bc91b61 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_vb.c
+++ b/src/mesa/tnl_dd/t_dd_vb.c
@@ -50,9 +50,9 @@ static void copy_pv_rgba4_spec5( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    LOCALVARS   
    GLubyte *verts = GET_VERTEX_STORE();
-   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
-   GLuint *dst = (GLuint *)(verts + (edst << shift));
-   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
    dst[4] = src[4];
    dst[5] = src[5];
 }
@@ -61,9 +61,9 @@ static void copy_pv_rgba4( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    LOCALVARS
    GLubyte *verts = GET_VERTEX_STORE();
-   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
-   GLuint *dst = (GLuint *)(verts + (edst << shift));
-   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
    dst[4] = src[4];
 }
 
@@ -71,9 +71,9 @@ static void copy_pv_rgba3( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
    LOCALVARS
    GLubyte *verts = GET_VERTEX_STORE();
-   GLuint shift = GET_VERTEX_STRIDE_SHIFT();
-   GLuint *dst = (GLuint *)(verts + (edst << shift));
-   GLuint *src = (GLuint *)(verts + (esrc << shift));
+   GLuint size = GET_VERTEX_SIZE();
+   GLuint *dst = (GLuint *)(verts + (edst * size));
+   GLuint *src = (GLuint *)(verts + (esrc * size));
    dst[3] = src[3];
 }
 
@@ -89,15 +89,15 @@ void TAG(translate_vertex)(GLcontext *ctx,
 
    if (format == TINY_VERTEX_FORMAT) {
       if (HAVE_HW_VIEWPORT) {
-        dst->win[0] = s[0]  * src->v.x + s[12];
-        dst->win[1] = s[5]  * src->v.y + s[13];
-        dst->win[2] = s[10] * src->v.z + s[14];
-        dst->win[3] = 1.0;
+        dst->attrib[FRAG_ATTRIB_WPOS][0] = s[0]  * src->v.x + s[12];
+        dst->attrib[FRAG_ATTRIB_WPOS][1] = s[5]  * src->v.y + s[13];
+        dst->attrib[FRAG_ATTRIB_WPOS][2] = s[10] * src->v.z + s[14];
+        dst->attrib[FRAG_ATTRIB_WPOS][3] = 1.0;
       } else {
-        dst->win[0] = UNVIEWPORT_X( src->v.x );
-        dst->win[1] = UNVIEWPORT_Y( src->v.y );
-        dst->win[2] = UNVIEWPORT_Z( src->v.z );
-        dst->win[3] = 1.0;
+        dst->attrib[FRAG_ATTRIB_WPOS][0] = UNVIEWPORT_X( src->v.x );
+        dst->attrib[FRAG_ATTRIB_WPOS][1] = UNVIEWPORT_Y( src->v.y );
+        dst->attrib[FRAG_ATTRIB_WPOS][2] = UNVIEWPORT_Z( src->v.z );
+        dst->attrib[FRAG_ATTRIB_WPOS][3] = 1.0;
       }
 
       dst->color[0] = src->tv.color.red;
@@ -109,21 +109,21 @@ void TAG(translate_vertex)(GLcontext *ctx,
       if (HAVE_HW_VIEWPORT) {
         if (HAVE_HW_DIVIDE && CHECK_HW_DIVIDE) {
            GLfloat oow = 1.0 / src->v.w;
-           dst->win[0] = s[0]  * src->v.x * oow + s[12];
-           dst->win[1] = s[5]  * src->v.y * oow + s[13];
-           dst->win[2] = s[10] * src->v.z * oow + s[14];
-           dst->win[3] = oow;
+           dst->attrib[FRAG_ATTRIB_WPOS][0] = s[0]  * src->v.x * oow + s[12];
+           dst->attrib[FRAG_ATTRIB_WPOS][1] = s[5]  * src->v.y * oow + s[13];
+           dst->attrib[FRAG_ATTRIB_WPOS][2] = s[10] * src->v.z * oow + s[14];
+           dst->attrib[FRAG_ATTRIB_WPOS][3] = oow;
         } else {
-           dst->win[0] = s[0]  * src->v.x + s[12];
-           dst->win[1] = s[5]  * src->v.y + s[13];
-           dst->win[2] = s[10] * src->v.z + s[14];
-           dst->win[3] = src->v.w;
+           dst->attrib[FRAG_ATTRIB_WPOS][0] = s[0]  * src->v.x + s[12];
+           dst->attrib[FRAG_ATTRIB_WPOS][1] = s[5]  * src->v.y + s[13];
+           dst->attrib[FRAG_ATTRIB_WPOS][2] = s[10] * src->v.z + s[14];
+           dst->attrib[FRAG_ATTRIB_WPOS][3] = src->v.w;
         }
       } else {
-        dst->win[0] = UNVIEWPORT_X( src->v.x );
-        dst->win[1] = UNVIEWPORT_Y( src->v.y );
-        dst->win[2] = UNVIEWPORT_Z( src->v.z );
-        dst->win[3] = src->v.w;
+        dst->attrib[FRAG_ATTRIB_WPOS][0] = UNVIEWPORT_X( src->v.x );
+        dst->attrib[FRAG_ATTRIB_WPOS][1] = UNVIEWPORT_Y( src->v.y );
+        dst->attrib[FRAG_ATTRIB_WPOS][2] = UNVIEWPORT_Z( src->v.z );
+        dst->attrib[FRAG_ATTRIB_WPOS][3] = src->v.w;
       }
 
       dst->color[0] = src->v.color.red;
@@ -131,60 +131,60 @@ void TAG(translate_vertex)(GLcontext *ctx,
       dst->color[2] = src->v.color.blue;
       dst->color[3] = src->v.color.alpha;
 
-      dst->specular[0] = src->v.specular.red;
-      dst->specular[1] = src->v.specular.green;
-      dst->specular[2] = src->v.specular.blue;
+      dst->attrib[FRAG_ATTRIB_COL1][0] = UBYTE_TO_FLOAT(src->v.specular.red);
+      dst->attrib[FRAG_ATTRIB_COL1][1] = UBYTE_TO_FLOAT(src->v.specular.green);
+      dst->attrib[FRAG_ATTRIB_COL1][2] = UBYTE_TO_FLOAT(src->v.specular.blue);
 
-      dst->fog = src->v.specular.alpha/255.0;
+      dst->attrib[FRAG_ATTRIB_FOGC][0] = UBYTE_TO_FLOAT(src->v.specular.alpha);
 
       if (HAVE_PTEX_VERTICES &&
          ((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;
         }
       }
    }
 
-   dst->pointSize = ctx->Point._Size;
+   dst->pointSize = ctx->Point.Size;
 }