mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into account
authorBrian Paul <brian.paul@tungstengraphics.com>
Wed, 8 Oct 2008 20:02:24 +0000 (14:02 -0600)
committerBrian Paul <brian.paul@tungstengraphics.com>
Wed, 8 Oct 2008 20:02:24 +0000 (14:02 -0600)
commit5c4bd76cb65245467d4ba04e893157055d738b2d
treed3ccab98f7cdfdab3411cbebb24651117cb873a9
parent4f1dafaa82985bf0f04a16ba2ba2d1e8ccf83724
mesa: in _mesa_combine_programs() take new STATE_CURRENT_ATTRIB color into account

Commit 1680ef869625dc1fe9cf481b180382a34e0738e7 changed the texenv program
to get color from a state register instead of a constant-valued vertex
attribute.  This broke program concatenation (so glDraw/CopyPixels broke).
Now check if the second program get's color from a constant register and
handle that case appropriately.
src/mesa/shader/program.c