summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-31 12:27:47 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-31 12:27:47 -0600
commit68ab379be09de775244bb787f0d30e562fc21038 (patch)
treecef4163701b0e55d89cbd1e092663ef1070111fd
parent8d9afa76eb090ff58ca9a8a7a86a0b23ffc56857 (diff)
more flags for MaintainTnlProgram case, update #includes
-rw-r--r--src/mesa/main/state.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0e4cf047c8..2f88ec615a 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -62,6 +62,7 @@
#if FEATURE_EXT_framebuffer_object
#include "fbobject.h"
#endif
+#include "ffvertex_prog.h"
#include "framebuffer.h"
#include "hint.h"
#include "histogram.h"
@@ -92,7 +93,6 @@
#include "shader/program.h"
#include "texenvprogram.h"
#endif
-#include "tnl/t_vp_build.h"
#if FEATURE_ARB_shader_objects
#include "shaders.h"
#endif
@@ -1202,7 +1202,9 @@ _mesa_update_state_locked( GLcontext *ctx )
prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _DD_NEW_SEPARATE_SPECULAR);
}
if (ctx->VertexProgram._MaintainTnlProgram) {
- prog_flags |= (_NEW_TEXTURE | _NEW_FOG | _NEW_LIGHT);
+ prog_flags |= (_NEW_TEXTURE | _NEW_TEXTURE_MATRIX |
+ _NEW_TRANSFORM | _NEW_POINT |
+ _NEW_FOG | _NEW_LIGHT);
}
if (new_state & prog_flags)
update_program( ctx );