diff options
| author | Marek Olšák <[email protected]> | 2016-11-23 23:11:45 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-11-29 23:52:31 +0100 |
| commit | fc9f7fc9d0e642579e494206f4ca9552e50b2c12 (patch) | |
| tree | 010120a6d48c92df147f4b9161b557157da2e29f /src/gallium/drivers | |
| parent | ea43d0b5e81e2368ca75199afbcb73e74cc6aa54 (diff) | |
radeonsi: set the smallest possible CB_TARGET_MASK
better safe than sorry; set_framebuffer_state always makes this dirty
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 10 |
1 files changed, 5 insertions, 5 deletions
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, |