Module: Mesa
Branch: master
Commit: 87b208a54e67b6b01845efa2ec20a96963399920
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=87b208a54e67b6b01845efa2ec20a96963399920
Author: Marek Olšák <marek.ol...@amd.com>
Date: Sat Nov 26 15:39:06 2016 +0100
radeonsi: always set all blend registers
better safe than sorry
Cc: 13.0 <mesa-sta...@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
---
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
@@ -453,8 +453,10 @@ static void *si_create_blend_state_mode(struct
pipe_context *ctx,
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.
@@ -463,16 +465,14 @@ static void *si_create_blend_state_mode(struct
pipe_context *ctx,
(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;
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
