fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

broadcom/vc5: Fix colormasking when we need to swap r/b colors.

Browse source 
Fixes part of piglit masked-clear.
This commit is contained in:
Eric Anholt 2017-11-07 15:35:33 -08:00
parent 2daf941a58
commit b63dd626b7
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/gallium/drivers/vc5/vc5_emit.c
View file

@ -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);
}
}
}