fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 01:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix texture enable regression

Browse source 
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
This commit is contained in:
Brian Paul 2009-03-02 15:19:53 -07:00
parent 7e0f47c134
commit e232471baa
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/mesa/main/texstate.c
View file

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