diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-04 09:14:33 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-04 09:14:33 -0600 |
| commit | 9d3929b60c9d4dd4403bcc63cb65d2673cf98b0e (patch) | |
| tree | 74cc9bb5ca977aa0527841517d22f21e59e0a93c | |
| parent | 9185a61c8a549e26e83d73e6e1fe9c65e5b88707 (diff) | |
texenv: Add missing dependency on VP changes.
Funny thing is I annotated this dependency in
e5f63c403b767f9974e8eb5d412c012b8a69287f, but didn't actually use it.
(cherry picked from master, commit 03187571b63d97e3d1406d329c5e760e16ef3181)
Conflicts:
src/mesa/main/state.c
| -rw-r--r-- | src/mesa/main/state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 1d3758a302..51726461b6 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -502,7 +502,8 @@ _mesa_update_state_locked( GLcontext *ctx ) /* Determine which state flags effect vertex/fragment program state */ if (ctx->FragmentProgram._MaintainTexEnvProgram) { prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR | - _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE); + _NEW_ARRAY | _NEW_LIGHT | _NEW_POINT | _NEW_RENDERMODE | + _NEW_PROGRAM); } if (ctx->VertexProgram._MaintainTnlProgram) { prog_flags |= (_NEW_ARRAY | _NEW_TEXTURE | _NEW_TEXTURE_MATRIX | |