texenv: Add missing dependency on VP changes.
authorBrian Paul <brianp@vmware.com>
Tue, 4 Aug 2009 15:14:33 +0000 (09:14 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 4 Aug 2009 15:14:33 +0000 (09:14 -0600)
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

src/mesa/main/state.c

index 1d3758a..5172646 100644 (file)
@@ -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 |