Move the call to _tnl_UpdateFixedFunctionProgram to make

it easier for hardware drivers to test this out.

diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 914121969c9b76fd80e7c8a149489c8548df20b5..82867605218ec03d9afd45c91223dce8fb3eb72c 100644 (file)
--- 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 d5412938f722e455cdb90603388df914b6cb3583..79baa3728adb4ffe479265ba2b6a2c1415b90717 100644 (file)
--- 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