From: Marek Olšák <[email protected]>

---
 src/gallium/drivers/radeonsi/si_state.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c 
b/src/gallium/drivers/radeonsi/si_state.c
index 3e8e0c8..47b1148 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -446,40 +446,40 @@ static void *si_create_blend_state_mode(struct 
pipe_context *ctx,
                unsigned dstA = state->rt[j].alpha_dst_factor;
 
                unsigned srcRGB_opt, dstRGB_opt, srcA_opt, dstA_opt;
                unsigned blend_cntl = 0;
 
                sx_mrt_blend_opt[i] =
                        
S_028760_COLOR_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED) |
                        
S_028760_ALPHA_COMB_FCN(V_028760_OPT_COMB_BLEND_DISABLED);
 
                /* Only set dual source blending for MRT0 to avoid a hang. */
-               if (i >= 1 && blend->dual_src_blend)
+               if (i >= 1 && blend->dual_src_blend) {
+                       si_pm4_set_reg(pm4, R_028780_CB_BLEND0_CONTROL + i * 4, 
blend_cntl);
                        continue;
+               }
 
                /* Only addition and subtraction equations are supported with
                 * dual source blending.
                 */
                if (blend->dual_src_blend &&
                    (eqRGB == PIPE_BLEND_MIN || eqRGB == PIPE_BLEND_MAX ||
                     eqA == PIPE_BLEND_MIN || eqA == PIPE_BLEND_MAX)) {
                        assert(!"Unsupported equation for dual source 
blending");
+                       si_pm4_set_reg(pm4, R_028780_CB_BLEND0_CONTROL + i * 4, 
blend_cntl);
                        continue;
                }
 
-               if (!state->rt[j].colormask)
-                       continue;
-
                /* cb_render_state will disable unused ones */
                blend->cb_target_mask |= (unsigned)state->rt[j].colormask << (4 
* i);
 
-               if (!state->rt[j].blend_enable) {
+               if (!state->rt[j].colormask || !state->rt[j].blend_enable) {
                        si_pm4_set_reg(pm4, R_028780_CB_BLEND0_CONTROL + i * 4, 
blend_cntl);
                        continue;
                }
 
                /* Blending optimizations for Stoney.
                 * These transformations don't change the behavior.
                 *
                 * First, get rid of DST in the blend factors:
                 *    func(src * DST, dst * 0) ---> func(src * 0, dst * SRC)
                 */
-- 
2.7.4

_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to