Browse Source

Move the call to _tnl_UpdateFixedFunctionProgram to make

it easier for hardware drivers to test this out.
tags/mesa_20050504
Keith Whitwell 20 years ago
parent
commit
a661654a33
2 changed files with 4 additions and 1 deletions
  1. 4
    0
      src/mesa/tnl/t_pipeline.c
  2. 0
    1
      src/mesa/tnl/t_vb_arbprogram.c

+ 4
- 0
src/mesa/tnl/t_pipeline.c View File

@@ -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)

+ 0
- 1
src/mesa/tnl/t_vb_arbprogram.c View File

@@ -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

Loading…
Cancel
Save