summaryrefslogtreecommitdiffstats
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2003-12-05 08:57:25 +0000
committerKeith Whitwell <[email protected]>2003-12-05 08:57:25 +0000
commitfcf02034b4d8cf8c678bba653047e187a23fc02d (patch)
tree22aaf452098789f1ee90b971b52776929635e5f2 /src/mesa/tnl
parentb25439a3bcce95befbfa2ec0969dd117a361c225 (diff)
Backout last change on the displaylist path to fix gears (and probably
everything else).
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_save_api.c22
1 files changed, 5 insertions, 17 deletions
diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c
index e8af68a27b0..5f015ddc466 100644
--- a/src/mesa/tnl/t_save_api.c
+++ b/src/mesa/tnl/t_save_api.c
@@ -307,7 +307,6 @@ static void _save_wrap_buffers( GLcontext *ctx )
TNLcontext *tnl = TNL_CONTEXT(ctx);
GLint i = tnl->save.prim_count - 1;
GLenum mode;
- GLuint count;
assert(i < (GLint) tnl->save.prim_max);
assert(i >= 0);
@@ -316,9 +315,7 @@ static void _save_wrap_buffers( GLcontext *ctx )
*/
tnl->save.prim[i].count = ((tnl->save.initial_counter - tnl->save.counter) -
tnl->save.prim[i].start);
- count = tnl->save.prim[i].count;
- mode = tnl->save.prim[i].mode;
-
+ mode = tnl->save.prim[i].mode & ~(PRIM_BEGIN|PRIM_END);
/* store the copied vertices, and allocate a new list.
*/
@@ -326,19 +323,10 @@ static void _save_wrap_buffers( GLcontext *ctx )
/* Restart interrupted primitive
*/
- if (!(mode & PRIM_END)) {
-
- if (count == tnl->save.copied.nr)
- tnl->save.prim[0].mode = mode;
- else
- tnl->save.prim[0].mode = mode & ~PRIM_BEGIN;
-
- tnl->save.prim[0].start = 0;
- tnl->save.prim[0].count = 0;
- tnl->save.prim_count = 1;
- }
- else
- tnl->save.prim_count = 0;
+ tnl->save.prim[0].mode = mode;
+ tnl->save.prim[0].start = 0;
+ tnl->save.prim[0].count = 0;
+ tnl->save.prim_count = 1;
}