implement arb_vertex_program in hw for r200. Code contains still some hacks, generic...

[mesa.git] / src / mesa / drivers / glide / fxvb.c

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index d96c6f5aba5a23082c4e48f714f4225d1ae834f4..34ada61f4e444d342105e18563a046567b75b34f 100644 (file)
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -17,9 +17,9 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, 
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+ * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
@@ -55,7 +55,14 @@ static void copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
    GrVertex *dst = fxMesa->verts + edst;
    GrVertex *src = fxMesa->verts + esrc;
 
+#if FX_PACKEDCOLOR
    *(GLuint *)&dst->pargb = *(GLuint *)&src->pargb;
+#else  /* !FX_PACKEDCOLOR */
+   COPY_FLOAT(dst->r, src->r);
+   COPY_FLOAT(dst->g, src->g);
+   COPY_FLOAT(dst->b, src->b);
+   COPY_FLOAT(dst->a, src->a);
+#endif /* !FX_PACKEDCOLOR */
 }
 
 static void copy_pv2( GLcontext *ctx, GLuint edst, GLuint esrc )
@@ -64,16 +71,26 @@ static void copy_pv2( GLcontext *ctx, GLuint edst, GLuint esrc )
    GrVertex *dst = fxMesa->verts + edst;
    GrVertex *src = fxMesa->verts + esrc;
 
+#if FX_PACKEDCOLOR
    *(GLuint *)&dst->pargb = *(GLuint *)&src->pargb;
    *(GLuint *)&dst->pspec = *(GLuint *)&src->pspec;
+#else  /* !FX_PACKEDCOLOR */
+   COPY_FLOAT(dst->r, src->r);
+   COPY_FLOAT(dst->g, src->g);
+   COPY_FLOAT(dst->b, src->b);
+   COPY_FLOAT(dst->a, src->a);
+   COPY_FLOAT(dst->r1, src->r1);
+   COPY_FLOAT(dst->g1, src->g1);
+   COPY_FLOAT(dst->b1, src->b1);
+#endif /* !FX_PACKEDCOLOR */
 }
 
 static struct {
-   void               (*emit)( GLcontext *, GLuint, GLuint, void * );
+   void                      (*emit) (GLcontext *ctx, GLuint start, GLuint end, void *dest);
    tnl_copy_pv_func    copy_pv;
    tnl_interp_func     interp;
-   GLboolean          (*check_tex_sizes)( GLcontext *ctx );
-   GLuint               vertex_format;
+   GLboolean         (*check_tex_sizes) (GLcontext *ctx);
+   GLuint              vertex_format;
 } setup_tab[MAX_SETUP];
 
 
@@ -88,12 +105,17 @@ static void interp_extras( GLcontext *ctx,
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
 
    if (VB->ColorPtr[1]) {
-      assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
-
-      INTERP_4F( t,
-                GET_COLOR(VB->ColorPtr[1], dst),
-                GET_COLOR(VB->ColorPtr[1], out),
-                GET_COLOR(VB->ColorPtr[1], in) );
+      /* If stride is zero, ColorPtr[1] is constant across the VB, so
+       * there is no point interpolating between two values as they will
+       * be identical.  This case is handled in t_dd_tritmp.h
+       */
+      if (VB->ColorPtr[1]->stride) {
+        assert(VB->ColorPtr[1]->stride == 4 * sizeof(GLfloat));
+        INTERP_4F( t,
+                   GET_COLOR(VB->ColorPtr[1], dst),
+                   GET_COLOR(VB->ColorPtr[1], out),
+                   GET_COLOR(VB->ColorPtr[1], in) );
+      }
 
       if (VB->SecondaryColorPtr[1]) {
         INTERP_3F( t,
@@ -640,8 +662,8 @@ void fxPrintSetupFlags(char *msg, GLuint flags )
    fprintf(stderr, "%s(%x): %s%s%s%s%s%s%s%s\n",
           msg,
           (int)flags,
-          (flags & SETUP_XYZW)     ? " xyzw," : "", 
-          (flags & SETUP_SNAP)     ? " snap," : "", 
+          (flags & SETUP_XYZW)     ? " xyzw," : "",
+          (flags & SETUP_SNAP)     ? " snap," : "",
           (flags & SETUP_RGBA)     ? " rgba," : "",
           (flags & SETUP_TMU0)     ? " tex-0," : "",
           (flags & SETUP_TMU1)     ? " tex-1," : "",
@@ -681,7 +703,7 @@ void fxCheckTexSizes( GLcontext *ctx )
 }
 
 
-void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
+void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint end,
                        GLuint newinputs )
 {
    fxMesaContext fxMesa = FX_CONTEXT( ctx );
@@ -691,24 +713,20 @@ void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
       return;
 
    if (newinputs & VERT_BIT_POS) {
-      setup_tab[fxMesa->SetupIndex].emit( ctx, start, count, v );   
+      setup_tab[fxMesa->SetupIndex].emit( ctx, start, end, v );
    } else {
       GLuint ind = 0;
 
-      /* [dBorca] masked by VERT_BIT_POS ?!?
-      if (newinputs & VERT_BIT_POINT_SIZE)
-        ind |= SETUP_PSIZ;*/
-
       if (newinputs & VERT_BIT_COLOR0)
         ind |= SETUP_RGBA;
-      
+
       if (newinputs & VERT_BIT_COLOR1)
         ind |= SETUP_SPEC;
 
       if (newinputs & VERT_BIT_FOG)
         ind |= SETUP_FOGC;
 
-      if (newinputs & VERT_BIT_TEX0) 
+      if (newinputs & VERT_BIT_TEX0)
         ind |= SETUP_TMU0;
 
       if (newinputs & VERT_BIT_TEX1)
@@ -720,7 +738,7 @@ void fxBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
       ind &= fxMesa->SetupIndex;
 
       if (ind) {
-        setup_tab[ind].emit( ctx, start, count, v );   
+        setup_tab[ind].emit( ctx, start, end, v );
       }
    }
 }