Mesa (mesa_7_5_branch): texenv: Add missing dependency on VP changes.

Brian Paul brianp at kemper.freedesktop.org
Tue Aug 4 15:18:14 UTC 2009


Module: Mesa
Branch: mesa_7_5_branch
Commit: 9d3929b60c9d4dd4403bcc63cb65d2673cf98b0e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d3929b60c9d4dd4403bcc63cb65d2673cf98b0e

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Aug  4 09:14:33 2009 -0600

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

---

 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 1d3758a..5172646 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 |




More information about the mesa-commit mailing list