From 0aaa27f29187ffb739c7ba2d789b82114f59f054 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 3 Jan 2018 11:45:58 -0800 Subject: [PATCH] mesa: Pass the translated color logic op dd_function_table::LogicOpcode MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit And delete the resulting dead code. This has only been compile-tested. v2: sed --in-place -e 's/color_logic_ops/gl_logicop_mode/g' $(grep -lr color_logic_ops src/) suggested by Brian. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Nicolai Hähnle --- src/mesa/drivers/common/driverfuncs.c | 2 +- src/mesa/drivers/dri/i915/i830_state.c | 8 ++-- src/mesa/drivers/dri/i915/i915_state.c | 8 ++-- src/mesa/drivers/dri/i915/intel_context.h | 1 - src/mesa/drivers/dri/i915/intel_screen.h | 1 - src/mesa/drivers/dri/i915/intel_state.c | 41 -------------------- src/mesa/drivers/dri/nouveau/nouveau_state.c | 2 +- src/mesa/drivers/dri/r200/r200_state.c | 7 ++-- src/mesa/drivers/dri/radeon/radeon_state.c | 27 ++----------- src/mesa/main/blend.c | 2 +- src/mesa/main/dd.h | 2 +- 11 files changed, 18 insertions(+), 83 deletions(-) diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 94dc0e62753..99c1520d2ad 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -277,7 +277,7 @@ _mesa_init_driver_state(struct gl_context *ctx) } ctx->Driver.LineWidth(ctx, ctx->Line.Width); - ctx->Driver.LogicOpcode(ctx, ctx->Color.LogicOp); + ctx->Driver.LogicOpcode(ctx, ctx->Color._LogicOp); ctx->Driver.PointSize(ctx, ctx->Point.Size); ctx->Driver.PolygonStipple(ctx, (const GLubyte *) ctx->PolygonStipple); ctx->Driver.Scissor(ctx); diff --git a/src/mesa/drivers/dri/i915/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index 7ce5ef7e41a..c8f48fbfa5a 100644 --- a/src/mesa/drivers/dri/i915/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c @@ -573,16 +573,16 @@ i830Scissor(struct gl_context * ctx) } static void -i830LogicOp(struct gl_context * ctx, GLenum opcode) +i830LogicOp(struct gl_context * ctx, enum gl_logicop_mode opcode) { struct i830_context *i830 = i830_context(ctx); - int tmp = intel_translate_logic_op(opcode); DBG("%s\n", __func__); - + + assert((unsigned)opcode <= 15); I830_STATECHANGE(i830, I830_UPLOAD_CTX); i830->state.Ctx[I830_CTXREG_STATE4] &= ~LOGICOP_MASK; - i830->state.Ctx[I830_CTXREG_STATE4] |= LOGIC_OP_FUNC(tmp); + i830->state.Ctx[I830_CTXREG_STATE4] |= opcode; } diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 685af046b59..bf7005a06fd 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -539,16 +539,16 @@ i915Scissor(struct gl_context * ctx) } static void -i915LogicOp(struct gl_context * ctx, GLenum opcode) +i915LogicOp(struct gl_context * ctx, enum gl_logicop_mode opcode) { struct i915_context *i915 = I915_CONTEXT(ctx); - int tmp = intel_translate_logic_op(opcode); DBG("%s\n", __func__); - + + assert((unsigned)opcode <= 15); I915_STATECHANGE(i915, I915_UPLOAD_CTX); i915->state.Ctx[I915_CTXREG_STATE4] &= ~LOGICOP_MASK; - i915->state.Ctx[I915_CTXREG_STATE4] |= LOGIC_OP_FUNC(tmp); + i915->state.Ctx[I915_CTXREG_STATE4] |= LOGIC_OP_FUNC(opcode); } diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index c59436aa2a0..5361dcf5e34 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -421,7 +421,6 @@ extern int intel_translate_shadow_compare_func(GLenum func); extern int intel_translate_compare_func(GLenum func); extern int intel_translate_stencil_op(GLenum op); extern int intel_translate_blend_factor(GLenum factor); -extern int intel_translate_logic_op(GLenum opcode); void intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable); diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h index a22888b391a..ec4592d1e10 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.h +++ b/src/mesa/drivers/dri/i915/intel_screen.h @@ -139,7 +139,6 @@ struct intel_screen #define get_time old_get_time #define intel_translate_blend_factor old_intel_translate_blend_factor #define intel_translate_compare_func old_intel_translate_compare_func -#define intel_translate_logic_op old_intel_translate_logic_op #define intel_translate_shadow_compare_func old_intel_translate_shadow_compare_func #define intel_translate_stencil_op old_intel_translate_stencil_op #define intel_init_syncobj_functions old_intel_init_syncobj_functions diff --git a/src/mesa/drivers/dri/i915/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c index 3de9d50a4d7..4f47013dd92 100644 --- a/src/mesa/drivers/dri/i915/intel_state.c +++ b/src/mesa/drivers/dri/i915/intel_state.c @@ -151,44 +151,3 @@ intel_translate_blend_factor(GLenum factor) fprintf(stderr, "Unknown value in %s: %x\n", __func__, factor); return BLENDFACT_ZERO; } - -int -intel_translate_logic_op(GLenum opcode) -{ - switch (opcode) { - case GL_CLEAR: - return LOGICOP_CLEAR; - case GL_AND: - return LOGICOP_AND; - case GL_AND_REVERSE: - return LOGICOP_AND_RVRSE; - case GL_COPY: - return LOGICOP_COPY; - case GL_COPY_INVERTED: - return LOGICOP_COPY_INV; - case GL_AND_INVERTED: - return LOGICOP_AND_INV; - case GL_NOOP: - return LOGICOP_NOOP; - case GL_XOR: - return LOGICOP_XOR; - case GL_OR: - return LOGICOP_OR; - case GL_OR_INVERTED: - return LOGICOP_OR_INV; - case GL_NOR: - return LOGICOP_NOR; - case GL_EQUIV: - return LOGICOP_EQUIV; - case GL_INVERT: - return LOGICOP_INV; - case GL_OR_REVERSE: - return LOGICOP_OR_RVRSE; - case GL_NAND: - return LOGICOP_NAND; - case GL_SET: - return LOGICOP_SET; - default: - return LOGICOP_SET; - } -} diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c index 1aa26e955bf..e2b01043675 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_state.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c @@ -298,7 +298,7 @@ nouveau_line_width(struct gl_context *ctx, GLfloat width) } static void -nouveau_logic_opcode(struct gl_context *ctx, GLenum opcode) +nouveau_logic_opcode(struct gl_context *ctx, UNUSED enum gl_logicop_mode opcode) { context_dirty(ctx, LOGIC_OPCODE); } diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 2705d224b95..62a089ea750 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1646,15 +1646,14 @@ static GLuint r200_rop_tab[] = { R200_ROP_SET, }; -static void r200LogicOpCode( struct gl_context *ctx, GLenum opcode ) +static void r200LogicOpCode(struct gl_context *ctx, enum gl_logicop_mode opcode) { r200ContextPtr rmesa = R200_CONTEXT(ctx); - GLuint rop = (GLuint)opcode - GL_CLEAR; - assert( rop < 16 ); + assert((unsigned) opcode <= 15); R200_STATECHANGE( rmesa, msk ); - rmesa->hw.msk.cmd[MSK_RB3D_ROPCNTL] = r200_rop_tab[rop]; + rmesa->hw.msk.cmd[MSK_RB3D_ROPCNTL] = opcode; } /* ============================================================= diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c index d2ca812155f..a5c7be32230 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state.c +++ b/src/mesa/drivers/dri/radeon/radeon_state.c @@ -1408,35 +1408,14 @@ static void radeonRenderMode( struct gl_context *ctx, GLenum mode ) FALLBACK( rmesa, RADEON_FALLBACK_RENDER_MODE, (mode != GL_RENDER) ); } - -static GLuint radeon_rop_tab[] = { - RADEON_ROP_CLEAR, - RADEON_ROP_AND, - RADEON_ROP_AND_REVERSE, - RADEON_ROP_COPY, - RADEON_ROP_AND_INVERTED, - RADEON_ROP_NOOP, - RADEON_ROP_XOR, - RADEON_ROP_OR, - RADEON_ROP_NOR, - RADEON_ROP_EQUIV, - RADEON_ROP_INVERT, - RADEON_ROP_OR_REVERSE, - RADEON_ROP_COPY_INVERTED, - RADEON_ROP_OR_INVERTED, - RADEON_ROP_NAND, - RADEON_ROP_SET, -}; - -static void radeonLogicOpCode( struct gl_context *ctx, GLenum opcode ) +static void radeonLogicOpCode(struct gl_context *ctx, enum gl_logicop_mode opcode) { r100ContextPtr rmesa = R100_CONTEXT(ctx); - GLuint rop = (GLuint)opcode - GL_CLEAR; - assert( rop < 16 ); + assert((unsigned) opcode <= 15); RADEON_STATECHANGE( rmesa, msk ); - rmesa->hw.msk.cmd[MSK_RB3D_ROPCNTL] = radeon_rop_tab[rop]; + rmesa->hw.msk.cmd[MSK_RB3D_ROPCNTL] = opcode; } /* ============================================================= diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 1c3711766ec..6b379f24992 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -905,7 +905,7 @@ logic_op(struct gl_context *ctx, GLenum opcode, bool no_error) ctx->Color._LogicOp = color_logicop_mapping[opcode & 0x0f]; if (ctx->Driver.LogicOpcode) - ctx->Driver.LogicOpcode(ctx, opcode); + ctx->Driver.LogicOpcode(ctx, ctx->Color._LogicOp); } diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 3455ddbd122..4fd4d864cd3 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -549,7 +549,7 @@ struct dd_function_table { /** Specify the width of rasterized lines */ void (*LineWidth)(struct gl_context *ctx, GLfloat width); /** Specify a logical pixel operation for color index rendering */ - void (*LogicOpcode)(struct gl_context *ctx, GLenum opcode); + void (*LogicOpcode)(struct gl_context *ctx, enum gl_logicop_mode opcode); void (*PointParameterfv)(struct gl_context *ctx, GLenum pname, const GLfloat *params); /** Specify the diameter of rasterized points */ -- 2.30.2