summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/etnaviv/etnaviv_blend.c
diff options
context:
space:
mode:
authorLucas Stach <[email protected]>2017-06-04 21:06:32 +0200
committerChristian Gmeiner <[email protected]>2017-06-16 15:26:23 +0200
commit8644b59b5d98cf58deaecc583f68edd8be23bfca (patch)
treeb4dcc38ef1fc09dd2c09f0aa9ae6ec6fc8c364a7 /src/gallium/drivers/etnaviv/etnaviv_blend.c
parentd6aa2ba2b293f78d9c28922ed3af9077100f3480 (diff)
etnaviv: mask correct channel for RB swapped rendertargets
Now that we support RB swapped targets by using a shader variant, we must derive the color mask from both the blend state and the bound framebuffer. Fixes piglit: fbo-colormask-formats Fixes: 7f62ffb68ad ("etnaviv: add support for rb swap") Cc: [email protected] Signed-off-by: Lucas Stach <[email protected]> Reviewed-by: Christian Gmeiner <[email protected]>
Diffstat (limited to 'src/gallium/drivers/etnaviv/etnaviv_blend.c')
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_blend.c48
1 files changed, 35 insertions, 13 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_blend.c b/src/gallium/drivers/etnaviv/etnaviv_blend.c
index ebef75daa7a..8ea09a37ae7 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_blend.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_blend.c
@@ -48,7 +48,7 @@ etna_blend_state_create(struct pipe_context *pctx,
* - NOT source factor is ONE and destination factor ZERO for both rgb and
* alpha (which would mean that blending is effectively disabled)
*/
- bool enable = rt0->blend_enable &&
+ co->enable = rt0->blend_enable &&
!(rt0->rgb_src_factor == PIPE_BLENDFACTOR_ONE &&
rt0->rgb_dst_factor == PIPE_BLENDFACTOR_ZERO &&
rt0->alpha_src_factor == PIPE_BLENDFACTOR_ONE &&
@@ -59,17 +59,11 @@ etna_blend_state_create(struct pipe_context *pctx,
* - NOT source factor is equal to destination factor for both rgb abd
* alpha (which would effectively that mean alpha is not separate)
*/
- bool separate_alpha = enable &&
+ bool separate_alpha = co->enable &&
!(rt0->rgb_src_factor == rt0->alpha_src_factor &&
rt0->rgb_dst_factor == rt0->alpha_dst_factor);
- /* If the complete render target is written, set full_overwrite:
- * - The color mask is 1111
- * - No blending is used
- */
- bool full_overwrite = (rt0->colormask == 15) && !enable;
-
- if (enable) {
+ if (co->enable) {
co->PE_ALPHA_CONFIG =
VIVS_PE_ALPHA_CONFIG_BLEND_ENABLE_COLOR |
COND(separate_alpha, VIVS_PE_ALPHA_CONFIG_BLEND_SEPARATE_ALPHA) |
@@ -83,10 +77,6 @@ etna_blend_state_create(struct pipe_context *pctx,
co->PE_ALPHA_CONFIG = 0;
}
- co->PE_COLOR_FORMAT =
- VIVS_PE_COLOR_FORMAT_COMPONENTS(rt0->colormask) |
- COND(full_overwrite, VIVS_PE_COLOR_FORMAT_OVERWRITE);
-
co->PE_LOGIC_OP =
VIVS_PE_LOGIC_OP_OP(so->logicop_enable ? so->logicop_func : LOGIC_OP_COPY) |
0x000E4000 /* ??? */;
@@ -107,3 +97,35 @@ etna_blend_state_create(struct pipe_context *pctx,
return co;
}
+
+bool
+etna_update_blend(struct etna_context *ctx)
+{
+ struct pipe_framebuffer_state *pfb = &ctx->framebuffer_s;
+ 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];
+ uint32_t colormask;
+
+ if (pfb->cbufs[0] &&
+ translate_rs_format_rb_swap(pfb->cbufs[0]->texture->format)) {
+ colormask = rt0->colormask & (PIPE_MASK_A | PIPE_MASK_G);
+ if (rt0->colormask & PIPE_MASK_R)
+ colormask |= PIPE_MASK_B;
+ if (rt0->colormask & PIPE_MASK_B)
+ colormask |= PIPE_MASK_R;
+ } else {
+ colormask = rt0->colormask;
+ }
+
+ /* If the complete render target is written, set full_overwrite:
+ * - The color mask is 1111
+ * - No blending is used
+ */
+ bool full_overwrite = (rt0->colormask == 0xf) && !blend->enable;
+ blend->PE_COLOR_FORMAT =
+ VIVS_PE_COLOR_FORMAT_COMPONENTS(colormask) |
+ COND(full_overwrite, VIVS_PE_COLOR_FORMAT_OVERWRITE);
+
+ return true;
+}