From 2836aab2031d5b6926923fbc70f867ec638301bd Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 9 Sep 2011 14:23:15 -0700 Subject: mesa: Use ColorLogicOpEnabled instead of _LogicOpEnabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since GL_EXT_blend_logic_op is removed, _LogicOpEnabled and ColorLogicOpEnabled always have the same value. Signed-off-by: Ian Romanick Reviewed-by: Roland Scheidegger Reviewed-by: Eric Anholt Reviewed-by: Marek Olšák --- src/mesa/drivers/dri/i965/brw_cc.c | 2 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 2 +- src/mesa/drivers/dri/i965/gen6_cc.c | 2 +- src/mesa/drivers/dri/radeon/radeon_pixel_read.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mesa/drivers') diff --git a/src/mesa/drivers/dri/i965/brw_cc.c b/src/mesa/drivers/dri/i965/brw_cc.c index 9c26150d241..c8ef8dbabae 100644 --- a/src/mesa/drivers/dri/i965/brw_cc.c +++ b/src/mesa/drivers/dri/i965/brw_cc.c @@ -143,7 +143,7 @@ static void upload_cc_unit(struct brw_context *brw) } /* _NEW_COLOR */ - if (ctx->Color._LogicOpEnabled && ctx->Color.LogicOp != GL_COPY) { + if (ctx->Color.ColorLogicOpEnabled && ctx->Color.LogicOp != GL_COPY) { cc->cc2.logicop_enable = 1; cc->cc5.logicop_func = intel_translate_logic_op(ctx->Color.LogicOp); } else if (ctx->Color.BlendEnabled) { diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 7528952f71d..1df2202b939 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -507,7 +507,7 @@ brw_update_renderbuffer_surface(struct brw_context *brw, if (intel->gen < 6) { /* _NEW_COLOR */ - if (!ctx->Color._LogicOpEnabled && + if (!ctx->Color.ColorLogicOpEnabled && (ctx->Color.BlendEnabled & (1 << unit))) surf[0] |= BRW_SURFACE_BLEND_ENABLED; diff --git a/src/mesa/drivers/dri/i965/gen6_cc.c b/src/mesa/drivers/dri/i965/gen6_cc.c index 41d13ad2bf4..b8047d5e9f0 100644 --- a/src/mesa/drivers/dri/i965/gen6_cc.c +++ b/src/mesa/drivers/dri/i965/gen6_cc.c @@ -58,7 +58,7 @@ prepare_blend_state(struct brw_context *brw) for (b = 0; b < nr_draw_buffers; b++) { /* _NEW_COLOR */ - if (ctx->Color._LogicOpEnabled) { + if (ctx->Color.ColorLogicOpEnabled) { struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[b]; /* _NEW_BUFFERS */ /* Floating point RTs should have no effect from LogicOp, diff --git a/src/mesa/drivers/dri/radeon/radeon_pixel_read.c b/src/mesa/drivers/dri/radeon/radeon_pixel_read.c index e44d6f2f8f7..62e047157d7 100644 --- a/src/mesa/drivers/dri/radeon/radeon_pixel_read.c +++ b/src/mesa/drivers/dri/radeon/radeon_pixel_read.c @@ -109,7 +109,7 @@ do_blit_readpixels(struct gl_context * ctx, return GL_FALSE; } - if (ctx->_ImageTransferState || ctx->Color._LogicOpEnabled) { + if (ctx->_ImageTransferState || ctx->Color.ColorLogicOpEnabled) { return GL_FALSE; } -- cgit v1.2.3