diff options
| author | Brian Paul <brianp@vmware.com> | 2011-09-30 08:15:30 -0600 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2011-10-02 18:10:40 +0200 |
| commit | 2ba0d0a5e8688a3210db505dc076109ffb7da7d9 (patch) | |
| tree | a96442349f1bbdfbdbdd867c924eaadef8796c5a | |
| parent | 1cf8f9599c05be35b0aa6a0862fe00ce6e95a090 (diff) | |
mesa: add _NEW_CURRENT_ATTRIB in _mesa_program_state_flags()
If color material mode is enabled, constant buffer entries related
to the material coefficients will depend on glColor. So add
_NEW_CURRENT_ATTRIB to the bitset returned for material-related
constants in _mesa_program_state_flags().
This fixes a bug exercised by the new piglit draw-arrays-colormaterial
test.
Note: This is a candidate for the 7.11 branch.
(cherry picked from commit 57169c469406f1880107a6b9f052708ce078942d)
| -rw-r--r-- | src/mesa/program/prog_statevars.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index 16f9690e865..2d10f724daf 100644 --- a/src/mesa/program/prog_statevars.c +++ b/src/mesa/program/prog_statevars.c @@ -664,10 +664,13 @@ _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]) { switch (state[0]) { case STATE_MATERIAL: + case STATE_LIGHTPROD: + case STATE_LIGHTMODEL_SCENECOLOR: + /* these can be effected by glColor when colormaterial mode is used */ + return _NEW_LIGHT | _NEW_CURRENT_ATTRIB; + case STATE_LIGHT: case STATE_LIGHTMODEL_AMBIENT: - case STATE_LIGHTMODEL_SCENECOLOR: - case STATE_LIGHTPROD: return _NEW_LIGHT; case STATE_TEXGEN: |