From a9a4c5489ec12f6aa768d44578c332f654c536ea Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 10 Feb 2005 10:55:30 +0000 Subject: Catch no-op vertex buffers consisting only of vertices which will also appear in a future buffer. --- src/mesa/tnl/t_vtx_exec.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/mesa/tnl') diff --git a/src/mesa/tnl/t_vtx_exec.c b/src/mesa/tnl/t_vtx_exec.c index e8700b934c..690912dd89 100644 --- a/src/mesa/tnl/t_vtx_exec.c +++ b/src/mesa/tnl/t_vtx_exec.c @@ -259,28 +259,30 @@ static GLuint _tnl_copy_vertices( GLcontext *ctx ) void _tnl_flush_vtx( GLcontext *ctx ) { TNLcontext *tnl = TNL_CONTEXT(ctx); + GLuint vertex_count = tnl->vtx.initial_counter - tnl->vtx.counter; if (0) _tnl_print_vtx( ctx ); - if (tnl->vtx.prim_count && - tnl->vtx.counter != tnl->vtx.initial_counter) { + if (tnl->vtx.prim_count && vertex_count) { tnl->vtx.copied.nr = _tnl_copy_vertices( ctx ); - if (ctx->NewState) - _mesa_update_state( ctx ); + if (tnl->vtx.copied.nr != vertex_count) { + if (ctx->NewState) + _mesa_update_state( ctx ); - if (tnl->pipeline.build_state_changes) - _tnl_validate_pipeline( ctx ); + if (tnl->pipeline.build_state_changes) + _tnl_validate_pipeline( ctx ); - _tnl_vb_bind_vtx( ctx ); + _tnl_vb_bind_vtx( ctx ); - /* Invalidate all stored data before and after run: - */ - tnl->pipeline.run_input_changes |= tnl->pipeline.inputs; - tnl->Driver.RunPipeline( ctx ); - tnl->pipeline.run_input_changes |= tnl->pipeline.inputs; + /* Invalidate all stored data before and after run: + */ + tnl->pipeline.run_input_changes |= tnl->pipeline.inputs; + tnl->Driver.RunPipeline( ctx ); + tnl->pipeline.run_input_changes |= tnl->pipeline.inputs; + } } tnl->vtx.prim_count = 0; -- cgit v1.2.3