summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-04-22 13:02:04 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-04-22 13:02:04 +0000
commita661654a33ba38990719ac9f5aea2910a5d5bf77 (patch)
tree9b90b1f424c985217ed1e9da1a6623d869ece52a
parent6f973f33679e034b7cb63806f1ddfabdbdd70123 (diff)
Move the call to _tnl_UpdateFixedFunctionProgram to make
it easier for hardware drivers to test this out.
-rw-r--r--src/mesa/tnl/t_pipeline.c4
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 914121969c..8286760521 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -126,6 +126,10 @@ void _tnl_run_pipeline( GLcontext *ctx )
* (ie const or non-const).
*/
if (check_input_changes( ctx ) || tnl->pipeline.new_state) {
+#if TNL_FIXED_FUNCTION_PROGRAM
+ _tnl_UpdateFixedFunctionProgram( ctx );
+#endif
+
for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
if (s->validate)
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index d5412938f7..79baa3728a 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1464,7 +1464,6 @@ validate_vertex_program( GLcontext *ctx, struct tnl_pipeline_stage *stage )
#if TNL_FIXED_FUNCTION_PROGRAM
if (!program) {
- _tnl_UpdateFixedFunctionProgram( ctx );
program = &ctx->_TnlProgram;
}
#endif