i965: Remove BRW_WM_LOCK dirty bit, introduced to work around lack of relocs.

[mesa.git] / src / mesa / drivers / glide / fxvbtmp.h

diff --git a/src/mesa/drivers/glide/fxvbtmp.h b/src/mesa/drivers/glide/fxvbtmp.h
index 188a71263a9bc6cc334ad74b767499be0f6505f7..f7970c78e290872e7527731ccc2bbaab132fb74d 100644 (file)
--- a/src/mesa/drivers/glide/fxvbtmp.h
+++ b/src/mesa/drivers/glide/fxvbtmp.h
@@ -43,11 +43,13 @@ static void TAG(emit)( GLcontext *ctx,
    GLfloat (*tc0)[4], (*tc1)[4];
    GLfloat (*col)[4], (*spec)[4];
    GLuint tc0_stride, tc1_stride, col_stride, spec_stride;
-   GLuint tc0_size, tc1_size;
+   GLuint tc0_size, tc1_size, col_size;
    GLfloat (*proj)[4] = VB->NdcPtr->data; 
    GLuint proj_stride = VB->NdcPtr->stride;
    GLfloat (*psize)[4];
    GLuint psize_stride;
+   GLfloat (*fog)[4];
+   GLuint fog_stride;
    GrVertex *v = (GrVertex *)dest;
    GLfloat u0scale,v0scale,u1scale,v1scale;
    const GLubyte *mask = VB->ClipMask;
@@ -80,6 +82,7 @@ static void TAG(emit)( GLcontext *ctx,
    if (IND & SETUP_RGBA) {
       col = VB->ColorPtr[0]->data;
       col_stride = VB->ColorPtr[0]->stride;
+      col_size = VB->ColorPtr[0]->size;
    }
 
    if (IND & SETUP_SPEC) {
@@ -87,11 +90,15 @@ static void TAG(emit)( GLcontext *ctx,
       spec_stride = VB->SecondaryColorPtr[0]->stride;
    }
 
+   if (IND & SETUP_FOGC) {
+      fog = VB->FogCoordPtr->data;
+      fog_stride = VB->FogCoordPtr->stride;
+   }
+
    if (start) {
       proj =  (GLfloat (*)[4])((GLubyte *)proj + start * proj_stride);
-      if (IND & SETUP_PSIZ) {
+      if (IND & SETUP_PSIZ)
          psize =  (GLfloat (*)[4])((GLubyte *)psize + start * psize_stride);
-      }
       if (IND & SETUP_TMU0)
         tc0 =  (GLfloat (*)[4])((GLubyte *)tc0 + start * tc0_stride);
       if (IND & SETUP_TMU1) 
@@ -100,6 +107,8 @@ static void TAG(emit)( GLcontext *ctx,
         STRIDE_4F(col, start * col_stride);
       if (IND & SETUP_SPEC)
         STRIDE_4F(spec, start * spec_stride);
+      if (IND & SETUP_FOGC)
+        fog =  (GLfloat (*)[4])((GLubyte *)fog + start * fog_stride);
    }
 
    for (i=start; i < end; i++, v++) {
@@ -115,39 +124,64 @@ static void TAG(emit)( GLcontext *ctx,
            VIEWPORT_Y(v->y,   proj[0][1]);
            VIEWPORT_Z(v->ooz, proj[0][2]);
            v->oow = proj[0][3];
-         } else {
-            /* clipped */
-            v->oow = 1.0;
-         }
 
-        if (IND & SETUP_SNAP) {
+           if (IND & SETUP_SNAP) {
 #if defined(USE_IEEE)
-           const float snapper = (3L << 18);
-           v->x += snapper;
-           v->x -= snapper;
-           v->y += snapper;
-           v->y -= snapper;
+              const float snapper = (3L << 18);
+              v->x += snapper;
+              v->x -= snapper;
+              v->y += snapper;
+              v->y -= snapper;
 #else
-           v->x = ((int) (v->x * 16.0f)) * (1.0f / 16.0f);
-           v->y = ((int) (v->y * 16.0f)) * (1.0f / 16.0f);
+              v->x = ((int) (v->x * 16.0f)) * (1.0f / 16.0f);
+              v->y = ((int) (v->y * 16.0f)) * (1.0f / 16.0f);
 #endif
-        }
+           }
+         } else {
+            /* clipped */
+            v->oow = 1.0;
+         }
 
         proj =  (GLfloat (*)[4])((GLubyte *)proj +  proj_stride);
       }
       if (IND & SETUP_RGBA) {
+#if FX_PACKEDCOLOR
          UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[2], col[0][0]);
          UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[1], col[0][1]);
          UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[0], col[0][2]);
-         UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[3], col[0][3]);
+         if (col_size == 4) {
+            UNCLAMPED_FLOAT_TO_UBYTE(v->pargb[3], col[0][3]);
+         } else {
+            v->pargb[3] = 255;
+         }
+#else  /* !FX_PACKEDCOLOR */
+         CNORM(v->r, col[0][0]);
+         CNORM(v->g, col[0][1]);
+         CNORM(v->b, col[0][2]);
+         if (col_size == 4) {
+            CNORM(v->a, col[0][3]);
+         } else {
+            v->a = 255.0f;
+         }
+#endif /* !FX_PACKEDCOLOR */
         STRIDE_4F(col, col_stride);
       }
       if (IND & SETUP_SPEC) {
+#if FX_PACKEDCOLOR
         UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[2], spec[0][0]);
         UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[1], spec[0][1]);
         UNCLAMPED_FLOAT_TO_UBYTE(v->pspec[0], spec[0][2]);
+#else  /* !FX_PACKEDCOLOR */
+         CNORM(v->r1, spec[0][0]);
+         CNORM(v->g1, spec[0][1]);
+         CNORM(v->b1, spec[0][2]);
+#endif /* !FX_PACKEDCOLOR */
         STRIDE_4F(spec, spec_stride);
       }
+      if (IND & SETUP_FOGC) {
+         v->fog = CLAMP(fog[0][0], 0.0f, 1.0f);
+        fog =  (GLfloat (*)[4])((GLubyte *)fog + fog_stride);
+      }
       if (IND & SETUP_TMU0) {
         GLfloat w = v->oow;
          v->tmuvtx[0].sow = tc0[0][0] * u0scale * w;
@@ -236,15 +270,32 @@ static void TAG(interp)( GLcontext *ctx,
    }
 
    
+#if FX_PACKEDCOLOR
    INTERP_UB( t, dst->pargb[0], out->pargb[0], in->pargb[0] );
    INTERP_UB( t, dst->pargb[1], out->pargb[1], in->pargb[1] );
    INTERP_UB( t, dst->pargb[2], out->pargb[2], in->pargb[2] );
    INTERP_UB( t, dst->pargb[3], out->pargb[3], in->pargb[3] );
+#else  /* !FX_PACKEDCOLOR */
+   INTERP_F( t, dst->r, out->r, in->r );
+   INTERP_F( t, dst->g, out->g, in->g );
+   INTERP_F( t, dst->b, out->b, in->b );
+   INTERP_F( t, dst->a, out->a, in->a );
+#endif /* !FX_PACKEDCOLOR */
 
    if (IND & SETUP_SPEC) {
+#if FX_PACKEDCOLOR
       INTERP_UB( t, dst->pspec[0], out->pspec[0], in->pspec[0] );
       INTERP_UB( t, dst->pspec[1], out->pspec[1], in->pspec[1] );
       INTERP_UB( t, dst->pspec[2], out->pspec[2], in->pspec[2] );
+#else  /* !FX_PACKEDCOLOR */
+      INTERP_F( t, dst->r1, out->r1, in->r1 );
+      INTERP_F( t, dst->g1, out->g1, in->g1 );
+      INTERP_F( t, dst->b1, out->b1, in->b1 );
+#endif /* !FX_PACKEDCOLOR */
+   }
+
+   if (IND & SETUP_FOGC) {
+      INTERP_F( t, dst->fog, out->fog, in->fog );
    }
 
    if (IND & SETUP_TMU0) {
@@ -298,16 +349,16 @@ static void TAG(init)( void )
    setup_tab[IND].check_tex_sizes = TAG(check_tex_sizes);
    setup_tab[IND].interp = TAG(interp);
 
+   setup_tab[IND].vertex_format = 0;
    if (IND & SETUP_PTEX) {
-      setup_tab[IND].vertex_format = (GR_STWHINT_W_DIFF_TMU0 |
-                                     GR_STWHINT_W_DIFF_TMU1);
-   }
-   else {
-      setup_tab[IND].vertex_format = 0;
+      setup_tab[IND].vertex_format |= GR_STWHINT_W_DIFF_TMU0;
    }
 
 #if (IND & SETUP_TMU1)
-     setup_tab[IND].vertex_format |= GR_STWHINT_ST_DIFF_TMU1;
+   setup_tab[IND].vertex_format |= GR_STWHINT_ST_DIFF_TMU1;
+   if (IND & SETUP_PTEX) {
+      setup_tab[IND].vertex_format |= GR_STWHINT_W_DIFF_TMU1;
+   }
 #endif
 
 #endif