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>
This commit is contained in:
Eric Anholt 2014-04-23 16:32:39 -07:00
parent 6bac47c05a
commit 62d46332d8
1 changed files with 2 additions and 0 deletions

View File

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