From: Eric Anholt <eric@anholt.net>
Date: Wed, 23 Apr 2014 23:32:39 +0000 (-0700)
Subject: mesa: Ensure that (unit->_Current != 0) == (unit->_ReallyEnabled != 0).
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=62d46332d8ed7a6270bc4e0520cf52668efd33b5;p=mesa.git

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 <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

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;
          }
       }