diff options
| author | Brian Paul <[email protected]> | 2013-05-01 19:15:32 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-05-02 09:03:14 -0600 |
| commit | 8be093e2f6301ff9c2728b8a24c83b401e80f070 (patch) | |
| tree | e4a6084fcc50c71017e157cada591f7c263b4f4e | |
| parent | cce6e30613f8a7c28c83a5e0411689d6184cbf8f (diff) | |
mesa: fix CurrentSavePrimitive <= GL_POLYGON tests
Use the new PRIM_MAX value instead so that new geometry shader primitive
types are accounted for.
Reviewed-by: Jose Fonseca <[email protected]>
| -rw-r--r-- | src/mesa/main/dlist.c | 4 | ||||
| -rw-r--r-- | src/mesa/vbo/vbo_save_api.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 3071a37e14b..9eb13fb385e 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -122,7 +122,7 @@ do { \ */ #define ASSERT_OUTSIDE_SAVE_BEGIN_END_WITH_RETVAL(ctx, retval) \ do { \ - if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON || \ + if (ctx->Driver.CurrentSavePrimitive <= PRIM_MAX || \ ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) { \ _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glBegin/End" ); \ return retval; \ @@ -137,7 +137,7 @@ do { \ */ #define ASSERT_OUTSIDE_SAVE_BEGIN_END(ctx) \ do { \ - if (ctx->Driver.CurrentSavePrimitive <= GL_POLYGON || \ + if (ctx->Driver.CurrentSavePrimitive <= PRIM_MAX || \ ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM) { \ _mesa_compile_error( ctx, GL_INVALID_OPERATION, "glBegin/End" ); \ return; \ diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 7ede8f4b7cb..52293ce09a5 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -1516,7 +1516,7 @@ vbo_save_SaveFlushVertices(struct gl_context *ctx) /* Noop when we are actually active: */ if (ctx->Driver.CurrentSavePrimitive == PRIM_INSIDE_UNKNOWN_PRIM || - ctx->Driver.CurrentSavePrimitive <= GL_POLYGON) + ctx->Driver.CurrentSavePrimitive <= PRIM_MAX) return; if (save->vert_count || save->prim_count) |