diff options
| author | Marek Olšák <[email protected]> | 2013-04-15 13:00:54 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-04-24 03:23:23 +0200 |
| commit | 99bd76d834e0c771274f327e1efe9b089ff273d4 (patch) | |
| tree | d58b554df1dc0ead07965381e5a6110d784eacf3 /src/mesa/main | |
| parent | b95cbe5e800e95d888d148e20e6a4e34c8857a9e (diff) | |
mesa: convert _NEW_RASTERIZER_DISCARD to a driver flag
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/enable.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 1b8ccc31aef..8fdd3070e0f 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -956,7 +956,8 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) goto invalid_enum_error; CHECK_EXTENSION(EXT_transform_feedback, cap); if (ctx->RasterDiscard != state) { - FLUSH_VERTICES(ctx, _NEW_RASTERIZER_DISCARD); + FLUSH_VERTICES(ctx, 0); + ctx->NewDriverState |= ctx->DriverFlags.NewRasterizerDiscard; ctx->RasterDiscard = state; } break; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 8d8622e9e1b..42b26fd138a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3151,12 +3151,6 @@ struct gl_matrix_stack /* gap, re-use for core Mesa state only; use ctx->DriverFlags otherwise */ #define _NEW_VARYING_VP_INPUTS (1 << 31) /**< gl_context::varying_vp_inputs */ #define _NEW_ALL ~0 - -/** - * We use _NEW_TRANSFORM for GL_RASTERIZER_DISCARD. This #define is for - * clarity. - */ -#define _NEW_RASTERIZER_DISCARD _NEW_TRANSFORM /*@}*/ @@ -3338,6 +3332,9 @@ struct gl_driver_flags /** gl_context::TransformFeedback::CurrentObject */ GLbitfield NewTransformFeedback; + + /** gl_context::RasterDiscard */ + GLbitfield NewRasterizerDiscard; }; struct gl_uniform_buffer_binding |