diff options
| author | Brian Paul <[email protected]> | 2013-04-23 10:57:45 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2013-04-23 21:09:17 -0600 |
| commit | f74da3e98807f788d3e830ef9f12e3ddfc99eac8 (patch) | |
| tree | 86ba2f261ef73b9b4a08d0117240ed021f2b9675 /src/mesa/main | |
| parent | 976b529b7c977e11a487c61d92bc5037cfd32155 (diff) | |
mesa: use new _mesa_inside_dlist_begin_end() function
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.h | 11 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 05251849b57..396cbd2d63d 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -201,6 +201,17 @@ _mesa_inside_begin_end(const struct gl_context *ctx) /** + * Are we currently between glBegin and glEnd in a display list? + */ +static inline GLboolean +_mesa_inside_dlist_begin_end(const struct gl_context *ctx) +{ + return ctx->Driver.CurrentSavePrimitive != PRIM_OUTSIDE_BEGIN_END; +} + + + +/** * \name Macros for flushing buffered rendering commands before state changes, * checking if inside glBegin/glEnd, etc. */ diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 33aeffcfb55..89af17c1e9e 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -3777,7 +3777,7 @@ save_ShadeModel(GLenum mode) /* Only save the value if we know the statechange will take effect: */ - if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END) + if (!_mesa_inside_dlist_begin_end(ctx)) ctx->ListState.Current.ShadeModel = mode; n = alloc_instruction(ctx, OPCODE_SHADE_MODEL, 1); @@ -5657,7 +5657,7 @@ save_Begin(GLenum mode) */ ctx->Driver.CurrentSavePrimitive = PRIM_INSIDE_UNKNOWN_PRIM; } - else if (ctx->Driver.CurrentSavePrimitive == PRIM_OUTSIDE_BEGIN_END) { + else if (!_mesa_inside_dlist_begin_end(ctx)) { ctx->Driver.CurrentSavePrimitive = mode; } else { |