From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 19 Sep 2001 03:37:16 +0000 (+0000)
Subject: set GR_STWHINT_ST_DIFF_TMU1 flag in the init() function (fixes multiarb demo)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2fc06af470da1929ac2fffc8d38a5d5ac87490bb;p=mesa.git

set GR_STWHINT_ST_DIFF_TMU1 flag in the init() function (fixes multiarb demo)
---

diff --git a/src/mesa/drivers/glide/fxvbtmp.h b/src/mesa/drivers/glide/fxvbtmp.h
index c0700b55998..1da7f98eea8 100644
--- a/src/mesa/drivers/glide/fxvbtmp.h
+++ b/src/mesa/drivers/glide/fxvbtmp.h
@@ -20,8 +20,8 @@ static void TAG(emit)( GLcontext *ctx,
 
 
    if (IND & SETUP_TMU0) {
-      tc0_stride = VB->TexCoordPtr[tmu0_source]->stride;
       tc0 = VB->TexCoordPtr[tmu0_source]->data;
+      tc0_stride = VB->TexCoordPtr[tmu0_source]->stride;
       u0scale = fxMesa->s0scale;
       v0scale = fxMesa->t0scale;
       if (IND & SETUP_PTEX)
@@ -137,7 +137,7 @@ static GLboolean TAG(check_tex_sizes)( GLcontext *ctx )
 	    return GL_FALSE;
       }
 
-      if (VB->TexCoordPtr[0]->size == 4)
+      if (VB->TexCoordPtr[0] && VB->TexCoordPtr[0]->size == 4)
 	 return GL_FALSE;
    }
 
@@ -269,6 +269,11 @@ static void TAG(init)( void )
    else {
       setup_tab[IND].vertex_format = 0;
    }
+
+#if (IND & SETUP_TMU1)
+     setup_tab[IND].vertex_format |= GR_STWHINT_ST_DIFF_TMU1;
+#endif
+
 #endif
 }