From 62d46332d8ed7a6270bc4e0520cf52668efd33b5 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 23 Apr 2014 16:32:39 -0700 Subject: [PATCH] mesa: Ensure that (unit->_Current != 0) == (unit->_ReallyEnabled != 0). I'm going to try to delete _ReallyEnabled, which is this weird bitfield with either 0 or 1 bits set with just the reference to _Current. Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke --- src/mesa/main/texstate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c index 36c543b9bad..5cbf7914b62 100644 --- a/src/mesa/main/texstate.c +++ b/src/mesa/main/texstate.c @@ -579,6 +579,7 @@ update_texture_state( struct gl_context *ctx ) texUnit->_ReallyEnabled = 0x0; if (enabledTargets == 0x0) { + _mesa_reference_texobj(&texUnit->_Current, NULL); /* neither vertex nor fragment processing uses this unit */ continue; } @@ -629,6 +630,7 @@ update_texture_state( struct gl_context *ctx ) } else { /* fixed-function: texture unit is really disabled */ + _mesa_reference_texobj(&texUnit->_Current, NULL); continue; } } -- 2.30.2