From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 5 Jan 2005 13:51:03 +0000 (+0000)
Subject: Avoid a segfault in multiarb.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=830e046972842482283f8d0eade8544780ae455f;p=mesa.git

Avoid a segfault in multiarb.c
---

diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 84731a316a7..43430210518 100644
--- a/src/mesa/drivers/dri/unichrome/via_state.c
+++ b/src/mesa/drivers/dri/unichrome/via_state.c
@@ -188,7 +188,6 @@ void viaEmitState(viaContextPtr vmesa)
       struct gl_texture_unit *texUnit1 = &ctx->Texture.Unit[1];
 
       {
-	 viaTextureObjectPtr t = (viaTextureObjectPtr)texUnit0->_Current->DriverData;
 	 GLuint nDummyValue = 0;
 
 	 BEGIN_RING( 8 );
@@ -199,7 +198,9 @@ void viaEmitState(viaContextPtr vmesa)
 	    if (VIA_DEBUG) fprintf(stderr, "multi texture\n");
 	    nDummyValue = (HC_SubA_HTXSMD << 24) | (1 << 3);
                 
-	    if (t && t->needClearCache) {
+	    /* Clear cache flag never set:
+	     */
+	    if (0) {
 	       OUT_RING( nDummyValue | HC_HTXCHCLR_MASK );
 	       OUT_RING( nDummyValue );
 	    }
@@ -212,7 +213,7 @@ void viaEmitState(viaContextPtr vmesa)
 	    if (VIA_DEBUG) fprintf(stderr, "single texture\n");
 	    nDummyValue = (HC_SubA_HTXSMD << 24) | 0;
                 
-	    if (t && t->needClearCache) {
+	    if (0) {
 	       OUT_RING( nDummyValue | HC_HTXCHCLR_MASK );
 	       OUT_RING( nDummyValue );
 	    }