From 44d8de433e684cb4c2bc4dfc5cc6919af1f3cc55 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 8 Jan 2001 04:06:56 +0000
Subject: Bring the FX driver into line with core mesa changes.

---
 src/mesa/drivers/glide/fxvb.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/mesa/drivers/glide/fxvb.c')

diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index 3138d59649..d95cfca579 100644
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -288,12 +288,13 @@ void fxDDSetupInit( void )
 void fx_validate_BuildProjVerts(GLcontext *ctx, GLuint start, GLuint count,
 				GLuint newinputs )
 {
-   GLuint setupindex = SETUP_XYZW;
    fxMesaContext fxMesa = (fxMesaContext)ctx->DriverCtx;
 
    if (!fxMesa->is_in_hardware) 
-     ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices;
+      ctx->Driver.BuildProjectedVertices = _swsetup_BuildProjectedVertices;
    else {
+      GLuint setupindex = SETUP_XYZW;
+
       fxMesa->tmu_source[0] = 0;
       fxMesa->tmu_source[1] = 1;
       fxMesa->tex_dest[0] = SETUP_TMU0;
@@ -357,20 +358,13 @@ void fx_BuildProjVerts( GLcontext *ctx, GLuint start, GLuint count,
 	 ind &= fxMesa->setupindex;
       }
 
-      if (0) {
-	 _tnl_print_vert_flags("newinputs", newinputs);
-	 fxPrintSetupFlags("setup function", ind); 
-      }
-
       if (ind) {
 	 if (fxMesa->new_state) 
-	    fxSetupFXUnits( ctx );
-      
-	 if (VB->importable_data)
+	    fxSetupFXUnits( ctx ); /* why? */
+	 
+	 if (VB->importable_data & newinputs)
 	    VB->import_data( ctx, VB->importable_data & newinputs,
-			     (VB->ClipOrMask
-			      ? VEC_NOT_WRITEABLE|VEC_BAD_STRIDE
-			      : VEC_BAD_STRIDE));
+			     VEC_BAD_STRIDE );
       
 	 setupfuncs[ind]( ctx, start, count );   
       }
-- 
cgit v1.2.3