diff options
| author | Ian Romanick <[email protected]> | 2018-01-03 11:45:58 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2018-01-26 11:21:46 +0800 |
| commit | 0aaa27f29187ffb739c7ba2d789b82114f59f054 (patch) | |
| tree | 9043ee0a749893d3676c354a5a9e391efa187260 /src/mesa/drivers/dri/r200 | |
| parent | cf0b26ec1250567fe0c5e9cc556806e64e843d19 (diff) | |
mesa: Pass the translated color logic op dd_function_table::LogicOpcode
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 <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 7 |
1 files changed, 3 insertions, 4 deletions
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; } /* ============================================================= |