From: Marek Olšák Date: Mon, 29 Dec 2014 14:09:22 +0000 (+0100) Subject: radeonsi: flush all CB/DB caches unconditionally when changing the framebuffer X-Git-Tag: upstream/17.1.0~21686 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c9ec6ca7ee30109f0bcf0f3f4bcee6fb30dac81;p=platform%2Fupstream%2Fmesa.git radeonsi: flush all CB/DB caches unconditionally when changing the framebuffer This is easier to read and will work better with shader image stores. Reviewed-by: Michel Dänzer --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 9e1b3cd..7086363 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1995,20 +1995,16 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, unsigned old_nr_samples = sctx->framebuffer.nr_samples; int i; - if (sctx->framebuffer.state.nr_cbufs) { - sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB | - SI_CONTEXT_FLUSH_AND_INV_CB_META; - } - if (sctx->framebuffer.state.zsbuf) { - sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_DB | - SI_CONTEXT_FLUSH_AND_INV_DB_META; - } - /* Only flush TC when changing the framebuffer state, because * the only client not using TC that can change textures is - * the framebuffer. */ + * the framebuffer. + * + * Flush all CB and DB caches here because all buffers can be used + * for write by both TC (with shader image stores) and CB/DB. + */ sctx->b.flags |= SI_CONTEXT_INV_TC_L1 | - SI_CONTEXT_INV_TC_L2; + SI_CONTEXT_INV_TC_L2 | + SI_CONTEXT_FLUSH_AND_INV_FRAMEBUFFER; util_copy_framebuffer_state(&sctx->framebuffer.state, state);