diff options
| author | Ian Romanick <[email protected]> | 2011-09-09 14:23:15 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-09-19 12:02:20 -0700 |
| commit | 2836aab2031d5b6926923fbc70f867ec638301bd (patch) | |
| tree | eeeb4396a6b4dd15a75ae53821fe37a6cec20793 /src/mesa/main | |
| parent | 113e8167de4500ea8b12176a938cbc4753f3a923 (diff) | |
mesa: Use ColorLogicOpEnabled instead of _LogicOpEnabled
Since GL_EXT_blend_logic_op is removed, _LogicOpEnabled and
ColorLogicOpEnabled always have the same value.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Reviewed-by: Eric Anholt <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/blend.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 16 |
3 files changed, 0 insertions, 18 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 4dcc0b9d2a3..98c14f56171 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -807,7 +807,6 @@ void _mesa_init_color( struct gl_context * ctx ) ASSIGN_4V( ctx->Color.BlendColorUnclamped, 0.0, 0.0, 0.0, 0.0 ); ctx->Color.IndexLogicOpEnabled = GL_FALSE; ctx->Color.ColorLogicOpEnabled = GL_FALSE; - ctx->Color._LogicOpEnabled = GL_FALSE; ctx->Color.LogicOp = GL_COPY; ctx->Color.DitherFlag = GL_TRUE; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d25d1a021a9..3b44ec6d58f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -789,7 +789,6 @@ struct gl_colorbuffer_attrib GLenum LogicOp; /**< Logic operator */ GLboolean IndexLogicOpEnabled; /**< Color index logic op enabled flag */ GLboolean ColorLogicOpEnabled; /**< RGBA logic op enabled flag */ - GLboolean _LogicOpEnabled; /**< RGBA logic op + EXT_blend_logic_op enabled flag */ /*@}*/ GLboolean DitherFlag; /**< Dither enable flag */ diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 457a730deea..9d9c952dcef 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -407,19 +407,6 @@ update_multisample(struct gl_context *ctx) /** - * Update derived color/blend/logicop state. - */ -static void -update_color(struct gl_context *ctx) -{ - /* This is needed to support 1.1's RGB logic ops AND - * 1.0's blending logicops. - */ - ctx->Color._LogicOpEnabled = _mesa_rgba_logicop_enabled(ctx); -} - - -/** * Update the ctx->Color._ClampFragmentColor field */ static void @@ -634,9 +621,6 @@ _mesa_update_state_locked( struct gl_context *ctx ) if (new_state & (_NEW_MULTISAMPLE | _NEW_BUFFERS)) update_multisample( ctx ); - if (new_state & _NEW_COLOR) - update_color( ctx ); - if (new_state & (_NEW_COLOR | _NEW_BUFFERS)) update_clamp_read_color(ctx); |