From 4d8f72f2bcf04f2af95e4eb43c9e3c65262b3974 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 16 Jan 2013 10:40:06 -0800 Subject: [PATCH] mesa: Fix regression in dlist save primitive tracking. My change 7ca4f07b5b77ccac0a9b60dc5ac9082906b5947e caused errors to not be thrown when they should, because the new if statement for ExecuteFlag made the CurrentSavePrimitive not get set. And on further review, we shouldn't be validating our primitive in GL_COMPILE mode, since the command shouldn't be executed yet. Partially fixes piglit gl-1.0-beginend-coverage. Reviewed-by: Brian Paul Reviewed-by: Ian Romanick --- src/mesa/main/dlist.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 6b99f35bb5f..f8014a46fbe 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -5648,16 +5648,9 @@ save_Begin(GLenum mode) Node *n; GLboolean error = GL_FALSE; - if (mode > GL_POLYGON) { - _mesa_error(ctx, GL_INVALID_ENUM, "glBegin(mode=%x)", mode); + if (ctx->ExecuteFlag && !_mesa_valid_prim_mode(ctx, mode, "glBegin")) { error = GL_TRUE; } - if (ctx->ExecuteFlag) { - if (!_mesa_valid_prim_mode(ctx, mode, "glBegin")) { - error = GL_TRUE; - } - } - else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) { /* Typically the first begin. This may raise an error on * playback, depending on whether CallList is issued from inside -- 2.30.2