summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/swrast_setup/ss_vbtmp.h8
-rw-r--r--src/mesa/tnl/t_imm_dlist.c3
-rw-r--r--src/mesa/tnl/t_pipeline.c11
3 files changed, 15 insertions, 7 deletions
diff --git a/src/mesa/swrast_setup/ss_vbtmp.h b/src/mesa/swrast_setup/ss_vbtmp.h
index 7e924b5a7e1..9ef51a3c205 100644
--- a/src/mesa/swrast_setup/ss_vbtmp.h
+++ b/src/mesa/swrast_setup/ss_vbtmp.h
@@ -1,4 +1,4 @@
-/* $Id: ss_vbtmp.h,v 1.14 2001/04/28 08:39:18 keithw Exp $ */
+/* $Id: ss_vbtmp.h,v 1.15 2001/04/30 09:04:00 keithw Exp $ */
/*
* Mesa 3-D graphics library
@@ -51,10 +51,10 @@ static void TAG(rs)(GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
const GLfloat tz = m[14];
GLuint maxtex = 0;
- if (!newinputs) {
- fprintf(stderr, "no new inputs\n");
+ /* Only the most basic optimization for cva:
+ */
+ if (!newinputs)
return;
- }
/* TODO: Get import_client_data to pad vectors out to 4 cleanly.
*
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;
}
}