diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-09-09 14:27:38 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-09-19 12:02:21 -0700 |
| commit | 2e1cc883b380c3e038b7f2890bf80ed1736a9f18 (patch) | |
| tree | 3a69cfa466ac16c8c21cd5950fcc0ff32657de28 /src/mesa/drivers/dri/r600 | |
| 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 <ian.d.romanick@intel.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Marek Olšák <maraeo@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/r600')
| -rw-r--r-- | src/mesa/drivers/dri/r600/evergreen_state.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r600/r700_state.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r600/evergreen_state.c b/src/mesa/drivers/dri/r600/evergreen_state.c index 81bf1172dc3..a908af4e12f 100644 --- a/src/mesa/drivers/dri/r600/evergreen_state.c +++ b/src/mesa/drivers/dri/r600/evergreen_state.c @@ -343,7 +343,7 @@ static void evergreenSetBlendState(struct gl_context * ctx) //diff : CB_COLOR_CO EVERGREEN_STATECHANGE(context, cb); - if (_mesa_rgba_logicop_enabled(ctx) || !ctx->Color.BlendEnabled) { + if (ctx->Color.ColorLogicOpEnabled || !ctx->Color.BlendEnabled) { SETfield(blend_reg, BLEND_ONE, COLOR_SRCBLEND_shift, COLOR_SRCBLEND_mask); SETfield(blend_reg, @@ -521,7 +521,7 @@ static void evergreenSetLogicOpState(struct gl_context *ctx) //diff : CB_COLOR_C EVERGREEN_STATECHANGE(context, cb); - if (_mesa_rgba_logicop_enabled(ctx)) + if (ctx->Color.ColorLogicOpEnabled) SETfield(evergreen->CB_COLOR_CONTROL.u32All, evergreen_translate_logicop(ctx->Color.LogicOp), EG_CB_COLOR_CONTROL__ROP3_shift, @@ -1149,7 +1149,7 @@ static void evergreenShadeModel(struct gl_context * ctx, GLenum mode) //same static void evergreenLogicOpcode(struct gl_context *ctx, GLenum logicop) //diff { - if (_mesa_rgba_logicop_enabled(ctx)) + if (ctx->Color.ColorLogicOpEnabled) evergreenSetLogicOpState(ctx); } diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c index 4d285b36489..99c03dff83e 100644 --- a/src/mesa/drivers/dri/r600/r700_state.c +++ b/src/mesa/drivers/dri/r600/r700_state.c @@ -454,7 +454,7 @@ static void r700SetBlendState(struct gl_context * ctx) R600_STATECHANGE(context, blnd); - if (_mesa_rgba_logicop_enabled(ctx) || !ctx->Color.BlendEnabled) { + if (ctx->Color.ColorLogicOpEnabled || !ctx->Color.BlendEnabled) { SETfield(blend_reg, BLEND_ONE, COLOR_SRCBLEND_shift, COLOR_SRCBLEND_mask); SETfield(blend_reg, @@ -645,7 +645,7 @@ static void r700SetLogicOpState(struct gl_context *ctx) R600_STATECHANGE(context, blnd); - if (_mesa_rgba_logicop_enabled(ctx)) + if (ctx->Color.ColorLogicOpEnabled) SETfield(r700->CB_COLOR_CONTROL.u32All, translate_logicop(ctx->Color.LogicOp), ROP3_shift, ROP3_mask); else @@ -658,7 +658,7 @@ static void r700SetLogicOpState(struct gl_context *ctx) */ static void r700LogicOpcode(struct gl_context *ctx, GLenum logicop) { - if (_mesa_rgba_logicop_enabled(ctx)) + if (ctx->Color.ColorLogicOpEnabled) r700SetLogicOpState(ctx); } |