diff options
| author | Ian Romanick <[email protected]> | 2011-09-09 14:27:38 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-09-19 12:02:21 -0700 |
| commit | 2e1cc883b380c3e038b7f2890bf80ed1736a9f18 (patch) | |
| tree | 3a69cfa466ac16c8c21cd5950fcc0ff32657de28 /src/mesa/drivers/dri/r300 | |
| parent | 2836aab2031d5b6926923fbc70f867ec638301bd (diff) | |
mesa: Replace _mesa_rgba_logicop_enabled(ctx) with ctx->Color.ColorLogicOpEnabled
Since GL_EXT_blend_logic_op is removed, _mesa_rgba_logicop_enabled(ctx)
just returns ctx->Color.ColorLogicOpEnabled. That seems kind of silly.
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/drivers/dri/r300')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 93a0dd168f4..51d794c9756 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -214,7 +214,7 @@ static void r300SetBlendState(struct gl_context * ctx) (R300_BLEND_GL_ZERO << R300_DST_BLEND_SHIFT); int eqnA = R300_COMB_FCN_ADD_CLAMP; - if (_mesa_rgba_logicop_enabled(ctx) || !ctx->Color.BlendEnabled) { + if (ctx->Color.ColorLogicOpEnabled || !ctx->Color.BlendEnabled) { r300SetBlendCntl(r300, func, eqn, 0, func, eqn); return; } @@ -335,7 +335,7 @@ static void r300SetLogicOpState(struct gl_context *ctx) { r300ContextPtr r300 = R300_CONTEXT(ctx); R300_STATECHANGE(r300, rop); - if (_mesa_rgba_logicop_enabled(ctx)) { + if (ctx->Color.ColorLogicOpEnabled) { r300->hw.rop.cmd[1] = R300_RB3D_ROPCNTL_ROP_ENABLE | translate_logicop(ctx->Color.LogicOp); } else { @@ -349,7 +349,7 @@ static void r300SetLogicOpState(struct gl_context *ctx) */ static void r300LogicOpcode(struct gl_context *ctx, GLenum logicop) { - if (_mesa_rgba_logicop_enabled(ctx)) + if (ctx->Color.ColorLogicOpEnabled) r300SetLogicOpState(ctx); } |