From: Lucas Stach Date: Wed, 14 Nov 2018 13:56:59 +0000 (+0100) Subject: etnaviv: enable full overwrite in a few more cases X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=b56d903b5abe7bf0157f99d707a9114b03231632;hp=6dade5d534a752ba769f2ea91153c6c5d2acb956 etnaviv: enable full overwrite in a few more cases Take into account the render target format when checking if the color mask affects all channels of the RT. This allows to enable full overwrite in a few cases where a non-alpha format is used. Signed-off-by: Lucas Stach Reviewed-by: Christian Gmeiner --- diff --git a/src/gallium/drivers/etnaviv/etnaviv_blend.c b/src/gallium/drivers/etnaviv/etnaviv_blend.c index 0e2299a50b3..061c9af5247 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_blend.c +++ b/src/gallium/drivers/etnaviv/etnaviv_blend.c @@ -114,6 +114,7 @@ etna_update_blend(struct etna_context *ctx) struct pipe_blend_state *pblend = ctx->blend; struct etna_blend_state *blend = etna_blend_state(pblend); const struct pipe_rt_blend_state *rt0 = &pblend->rt[0]; + const struct util_format_description *desc; uint32_t colormask; if (pfb->cbufs[0] && @@ -128,11 +129,13 @@ etna_update_blend(struct etna_context *ctx) } /* If the complete render target is written, set full_overwrite: - * - The color mask is 1111 - * - No blending is used + * - The color mask covers all channels of the render target + * - No blending or logicop is used */ - bool full_overwrite = ((rt0->colormask == 0xf) && blend->fo_allowed) || - !pfb->cbufs[0]; + if (pfb->cbufs[0]) + desc = util_format_description(pfb->cbufs[0]->format); + bool full_overwrite = !pfb->cbufs[0] || ((blend->fo_allowed && + util_format_colormask_full(desc, colormask))); blend->PE_COLOR_FORMAT = VIVS_PE_COLOR_FORMAT_COMPONENTS(colormask) | COND(full_overwrite, VIVS_PE_COLOR_FORMAT_OVERWRITE);