diff options
| -rw-r--r-- | src/mesa/tnl/t_pipeline.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_arbprogram.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c index 914121969c9..82867605218 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 d5412938f72..79baa3728ad 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 |