From 2bfe9d4538693ebad3c0330a92e432c6c4c5afd3 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Mon, 29 Dec 2014 14:02:46 +0100 Subject: radeonsi: rename flush flags, split the TC flag into L1 and L2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer --- src/gallium/drivers/radeonsi/si_state.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/radeonsi/si_state.c') diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index c9997b37650..4b146b5c86d 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1996,12 +1996,12 @@ static void si_set_framebuffer_state(struct pipe_context *ctx, int i; if (sctx->framebuffer.state.nr_cbufs) { - sctx->b.flags |= R600_CONTEXT_FLUSH_AND_INV_CB | - R600_CONTEXT_FLUSH_AND_INV_CB_META; + sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_CB | + SI_CONTEXT_FLUSH_AND_INV_CB_META; } if (sctx->framebuffer.state.zsbuf) { - sctx->b.flags |= R600_CONTEXT_FLUSH_AND_INV_DB | - R600_CONTEXT_FLUSH_AND_INV_DB_META; + sctx->b.flags |= SI_CONTEXT_FLUSH_AND_INV_DB | + SI_CONTEXT_FLUSH_AND_INV_DB_META; } util_copy_framebuffer_state(&sctx->framebuffer.state, state); @@ -2753,8 +2753,9 @@ static void si_texture_barrier(struct pipe_context *ctx) { struct si_context *sctx = (struct si_context *)ctx; - sctx->b.flags |= R600_CONTEXT_INV_TEX_CACHE | - R600_CONTEXT_FLUSH_AND_INV_CB; + sctx->b.flags |= SI_CONTEXT_INV_TC_L1 | + SI_CONTEXT_INV_TC_L2 | + SI_CONTEXT_FLUSH_AND_INV_CB; } static void *si_create_blend_custom(struct si_context *sctx, unsigned mode) -- cgit v1.2.3