mesa: only use fallback texture when using shaders, not fixed-function (take two)
authorBrian Paul <brianp@vmware.com>
Tue, 5 May 2009 22:21:20 +0000 (16:21 -0600)
committerEric Anholt <eric@anholt.net>
Tue, 7 Jul 2009 23:02:45 +0000 (16:02 -0700)
commit4adc9b4a5be72e34d464ce341b011c42517d969a
tree199c6594893aeb61c4379a03b5e983621feaacbb
parent7b861b9b9efdb3ac0dfc3806afcd494cd0ea006c
mesa: only use fallback texture when using shaders, not fixed-function (take two)

The semantics are a little different for shaders vs. fixed-function when
trying to use an incomplete texture.  The fallback texture returning
(0,0,0,1) should only be used with shaders.  For fixed function, the texture
unit is truly disabled/ignored.

Fixes glean fbo test regression.
(cherry picked from commit 01e16befd4809e3e93ee7855a4a5d7df9fe010d9)
(cherry picked from commit 51325f44d1e7e62b47795a79f8038d10dc5bc30b)
[anholt: squashed these two together from master, skipping the mess in between]
src/mesa/main/texstate.c