summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2003-10-15 10:02:57 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2003-10-15 10:02:57 +0000
commit8d8bb0679ccca28f40eefe0fa82f4ffb235692d5 (patch)
tree2fd6b7075dd3b9f6c12e9c2fb41be96c5f34fd01
parent5affcd3cbb5a448ba7d0e2219a352a6c8190b25e (diff)
Fix assertion
-rw-r--r--src/mesa/tnl/t_save_api.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c
index 792d4ad943..d17b41d009 100644
--- a/src/mesa/tnl/t_save_api.c
+++ b/src/mesa/tnl/t_save_api.c
@@ -388,6 +388,8 @@ static void _save_upgrade_vertex( GLcontext *ctx,
*/
if (tnl->save.initial_counter != tnl->save.counter)
_save_wrap_buffers( ctx );
+ else
+ assert( tnl->save.copied.nr == 0 );
/* Do a COPY_TO_CURRENT to ensure back-copying works for the case
* when the attribute already exists in the vertex and is having
@@ -1158,10 +1160,10 @@ static void _save_End( void )
tnl->save.prim[i].count = ((tnl->save.initial_counter - tnl->save.counter) -
tnl->save.prim[i].start);
- if (i == tnl->save.prim_max - 1)
+ if (i == tnl->save.prim_max - 1) {
_save_compile_vertex_list( ctx );
-
- assert(tnl->save.copied.nr == 0);
+ assert(tnl->save.copied.nr == 0);
+ }
/* Swap out this vertex format while outside begin/end. Any color,
* etc. received between here and the next begin will be compiled