diff options
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_shaders.c | 7 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 94dbe4c15b9..5d554486cb7 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -2350,17 +2350,6 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, vi_separate_dcc_start_query(ctx, rtex); } } - /* Set the second SPI format for possible dual-src blending. */ - if (i == 1 && surf) { - sctx->framebuffer.spi_shader_col_format |= - surf->spi_shader_col_format << (i * 4); - sctx->framebuffer.spi_shader_col_format_alpha |= - surf->spi_shader_col_format_alpha << (i * 4); - sctx->framebuffer.spi_shader_col_format_blend |= - surf->spi_shader_col_format_blend << (i * 4); - sctx->framebuffer.spi_shader_col_format_blend_alpha |= - surf->spi_shader_col_format_blend_alpha << (i * 4); - } if (state->zsbuf) { surf = (struct r600_surface*)state->zsbuf; diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c index 87d0b7d9022..d82139745b9 100644 --- a/src/gallium/drivers/radeonsi/si_state_shaders.c +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c @@ -900,6 +900,13 @@ static inline void si_shader_selector_key(struct pipe_context *ctx, sctx->framebuffer.spi_shader_col_format_alpha) | (~blend->blend_enable_4bit & ~blend->need_src_alpha_4bit & sctx->framebuffer.spi_shader_col_format); + + /* The output for dual source blending should have + * the same format as the first output. + */ + if (blend->dual_src_blend) + key->ps.epilog.spi_shader_col_format |= + (key->ps.epilog.spi_shader_col_format & 0xf) << 4; } else key->ps.epilog.spi_shader_col_format = sctx->framebuffer.spi_shader_col_format; |