summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-01-05 13:51:03 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-01-05 13:51:03 +0000
commit830e046972842482283f8d0eade8544780ae455f (patch)
tree05d8d19dd709b921d1ab8ca220ec2a6a84e3150c /src
parente3fe80a60f36fad8f12220ba435bfecc8685c264 (diff)
Avoid a segfault in multiarb.c
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/unichrome/via_state.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 84731a316a..4343021051 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 );
}