summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-03-02 15:19:53 -0700
committerBrian Paul <brianp@vmware.com>2009-03-02 15:19:53 -0700
commite232471baa3a7cfa7a76b9cfe55dfb7da79fedbe (patch)
treebbf77909a554ca908f1bca3bba4601a9eb661a95 /src
parent7e0f47c1348273ed3bb39d00aa4a9498a28b8d6a (diff)
mesa: fix texture enable regression
Need to clear the _ReallyEnabled field before possibly continuing the loop. Also, set _Current pointer to NULL if the unit is no longer enabled. Fixes piglit lodbias regression
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/texstate.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 672a125bf1..b29721eff6 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -549,13 +549,13 @@ update_texture_state( GLcontext *ctx )
enabledTargets = enabledVertTargets | enabledFragTargets;
+ texUnit->_ReallyEnabled = 0x0;
+
if (enabledTargets == 0x0) {
/* neither vertex nor fragment processing uses this unit */
continue;
}
- texUnit->_ReallyEnabled = 0x0;
-
/* Look for the highest priority texture target that's enabled (or used
* by the vert/frag shaders) and "complete". That's the one we'll use
* for texturing. If we're using vert/frag program we're guaranteed
@@ -580,6 +580,7 @@ update_texture_state( GLcontext *ctx )
update_texture_compare_function(ctx, texUnit->_Current);
if (!texUnit->_ReallyEnabled) {
+ _mesa_reference_texobj(&texUnit->_Current, NULL);
continue;
}