Move the call to _tnl_UpdateFixedFunctionProgram to make

it easier for hardware drivers to test this out.
This commit is contained in:
Keith Whitwell
2005-04-22 13:02:04 +00:00
parent 6f973f3367
commit a661654a33
2 changed files with 4 additions and 1 deletions

View File

@@ -126,6 +126,10 @@ void _tnl_run_pipeline( GLcontext *ctx )
* (ie const or non-const). * (ie const or non-const).
*/ */
if (check_input_changes( ctx ) || tnl->pipeline.new_state) { 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++) { for (i = 0; i < tnl->pipeline.nr_stages ; i++) {
struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i]; struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
if (s->validate) if (s->validate)

View File

@@ -1464,7 +1464,6 @@ validate_vertex_program( GLcontext *ctx, struct tnl_pipeline_stage *stage )
#if TNL_FIXED_FUNCTION_PROGRAM #if TNL_FIXED_FUNCTION_PROGRAM
if (!program) { if (!program) {
_tnl_UpdateFixedFunctionProgram( ctx );
program = &ctx->_TnlProgram; program = &ctx->_TnlProgram;
} }
#endif #endif