From: Eric Anholt <eric@anholt.net>
Date: Tue, 3 Oct 2017 00:05:24 +0000 (-0700)
Subject: broadcom/vc5: Fix color masks for non-independent blending.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f2e6e1bbc381ad6a7575e9940248362f8cb0adac;p=mesa.git

broadcom/vc5: Fix color masks for non-independent blending.

This gets fbo-mrt-alphatest working except for the second RT's clear color.
---

diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c
index 475db7bc868..dd055d49208 100644
--- a/src/gallium/drivers/vc5/vc5_emit.c
+++ b/src/gallium/drivers/vc5/vc5_emit.c
@@ -336,14 +336,22 @@ vc5_emit_state(struct pipe_context *pctx)
                 }
 
                 cl_emit(&job->bcl, COLOUR_WRITE_MASKS, mask) {
-                        mask.render_target_0_per_colour_component_write_masks =
-                                (~blend->rt[0].colormask) & 0xf;
-                        mask.render_target_1_per_colour_component_write_masks =
-                                (~blend->rt[1].colormask) & 0xf;
-                        mask.render_target_2_per_colour_component_write_masks =
-                                (~blend->rt[2].colormask) & 0xf;
-                        mask.render_target_3_per_colour_component_write_masks =
-                                (~blend->rt[3].colormask) & 0xf;
+                        if (blend->independent_blend_enable) {
+                                mask.render_target_0_per_colour_component_write_masks =
+                                        (~blend->rt[0].colormask) & 0xf;
+                                mask.render_target_1_per_colour_component_write_masks =
+                                        (~blend->rt[1].colormask) & 0xf;
+                                mask.render_target_2_per_colour_component_write_masks =
+                                        (~blend->rt[2].colormask) & 0xf;
+                                mask.render_target_3_per_colour_component_write_masks =
+                                        (~blend->rt[3].colormask) & 0xf;
+                        } 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;
+                        }
                 }
         }