diff options
| author | Eric Anholt <[email protected]> | 2017-11-07 15:35:33 -0800 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-11-17 16:09:55 -0800 |
| commit | b63dd626b7961e6cabcd0d49e0d424a69d454511 (patch) | |
| tree | 620e1601a223ffc2c356523dce3fec14ec0a74c3 /src/gallium/drivers/vc5 | |
| parent | 2daf941a58bacc3ade050218b2b31002f30ea29a (diff) | |
broadcom/vc5: Fix colormasking when we need to swap r/b colors.
Fixes part of piglit masked-clear.
Diffstat (limited to 'src/gallium/drivers/vc5')
| -rw-r--r-- | src/gallium/drivers/vc5/vc5_emit.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c index e54de7120c8..ecb1b25a552 100644 --- a/src/gallium/drivers/vc5/vc5_emit.c +++ b/src/gallium/drivers/vc5/vc5_emit.c @@ -207,6 +207,18 @@ emit_textures(struct vc5_context *vc5, struct vc5_texture_stateobj *stage_tex) } } +static uint32_t +translate_colormask(struct vc5_context *vc5, uint32_t colormask, int rt) +{ + if (vc5->swap_color_rb & (1 << rt)) { + colormask = ((colormask & (2 | 8)) | + ((colormask & 1) << 2) | + ((colormask & 4) >> 2)); + } + + return (~colormask) & 0xf; +} + void vc5_emit_state(struct pipe_context *pctx) { @@ -384,19 +396,22 @@ vc5_emit_state(struct pipe_context *pctx) cl_emit(&job->bcl, COLOUR_WRITE_MASKS, mask) { if (blend->independent_blend_enable) { mask.render_target_0_per_colour_component_write_masks = - (~blend->rt[0].colormask) & 0xf; + translate_colormask(vc5, blend->rt[0].colormask, 0); mask.render_target_1_per_colour_component_write_masks = - (~blend->rt[1].colormask) & 0xf; + translate_colormask(vc5, blend->rt[1].colormask, 1); mask.render_target_2_per_colour_component_write_masks = - (~blend->rt[2].colormask) & 0xf; + translate_colormask(vc5, blend->rt[2].colormask, 2); mask.render_target_3_per_colour_component_write_masks = - (~blend->rt[3].colormask) & 0xf; + translate_colormask(vc5, blend->rt[3].colormask, 3); } else { - uint8_t colormask = (~blend->rt[0].colormask) & 0xf; - mask.render_target_0_per_colour_component_write_masks = colormask; - mask.render_target_1_per_colour_component_write_masks = colormask; - mask.render_target_2_per_colour_component_write_masks = colormask; - mask.render_target_3_per_colour_component_write_masks = colormask; + mask.render_target_0_per_colour_component_write_masks = + translate_colormask(vc5, blend->rt[0].colormask, 0); + mask.render_target_1_per_colour_component_write_masks = + translate_colormask(vc5, blend->rt[0].colormask, 1); + mask.render_target_2_per_colour_component_write_masks = + translate_colormask(vc5, blend->rt[0].colormask, 2); + mask.render_target_3_per_colour_component_write_masks = + translate_colormask(vc5, blend->rt[0].colormask, 3); } } } |