Restore optimization for cva glArrayElement operation.

2 files changed, 11 insertions, 3 deletions

diff --git a/src/mesa/tnl/t_imm_dlist.c b/src/mesa/tnl/t_imm_dlist.c
index 54f7132e0ea..7218244ae31 100644
--- a/src/mesa/tnl/t_imm_dlist.c
+++ b/src/mesa/tnl/t_imm_dlist.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_dlist.c,v 1.13 2001/04/26 14:53:48 keithw Exp $ */
+/* $Id: t_imm_dlist.c,v 1.14 2001/04/30 09:04:00 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -314,6 +314,7 @@ _tnl_EndList( GLcontext *ctx )
 
    ASSERT(IM->ref_count == 0);
 
+   tnl->ExecCopyCount = 0;
    tnl->ExecCopySource = IM;
    IM->ref_count++;
 
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 81f3b078f21..73fa9c95719 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,4 +1,4 @@
-/* $Id: t_pipeline.c,v 1.16 2001/04/19 12:23:07 keithw Exp $ */
+/* $Id: t_pipeline.c,v 1.17 2001/04/30 09:04:00 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -132,6 +132,9 @@ void _tnl_run_pipeline( GLcontext *ctx )
     */
    ASSERT(pipe->build_state_changes == 0);
 
+/*     _tnl_print_vert_flags( "run_pipeline, new inputs", changed_inputs ); */
+/*     _mesa_print_state( "run_pipeline, new state", changed_state ); */
+   
    START_FAST_MATH(__tmp);
    if (tnl->Driver.PipelineStart)
       tnl->Driver.PipelineStart( ctx );
@@ -154,8 +157,12 @@ void _tnl_run_pipeline( GLcontext *ctx )
 	    if (s->changed_inputs)
 	       changed_inputs |= s->outputs;
 
-/*  	    fprintf(stderr, "run %s\n", s->name); */
+  	    if (0)
+	       fprintf(stderr, "run %s inputs %x\n", 
+		       s->name, s->changed_inputs); 
+
 	    running = s->run( ctx, s );
+	    s->changed_inputs = 0;             /* readded this apr 30  */
 	    VB->importable_data &= ~s->outputs;
 	 }
       }