From: Marek Olšák Date: Wed, 23 Nov 2016 22:11:45 +0000 (+0100) Subject: radeonsi: set the smallest possible CB_TARGET_MASK X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc9f7fc9d0e642579e494206f4ca9552e50b2c12;p=mesa.git radeonsi: set the smallest possible CB_TARGET_MASK better safe than sorry; set_framebuffer_state always makes this dirty Reviewed-by: Nicolai Hähnle --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index b4683c52dd0..3e8e0c8405c 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -94,13 +94,13 @@ static void si_emit_cb_render_state(struct si_context *sctx, struct r600_atom *a { struct radeon_winsys_cs *cs = sctx->b.gfx.cs; struct si_state_blend *blend = sctx->queued.named.blend; - uint32_t cb_target_mask, i; + /* CB_COLORn_INFO.FORMAT=INVALID should disable unbound colorbuffers, + * but you never know. */ + uint32_t cb_target_mask = sctx->framebuffer.colorbuf_enabled_4bit; + unsigned i; - /* CB_COLORn_INFO.FORMAT=INVALID disables empty colorbuffer slots. */ if (blend) - cb_target_mask = blend->cb_target_mask; - else - cb_target_mask = 0xffffffff; + cb_target_mask &= blend->cb_target_mask; /* Avoid a hang that happens when dual source blending is enabled * but there is not enough color outputs. This is undefined behavior,