X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fsi_state_draw.c;h=d3e6e1ac93762ee596fbb96b3e5e13bb46199173;hb=a67d81580b520aa6adf6c06ef29f27692b1aebe5;hp=d7325ff37d2c7ef6247b891bff273feb9450b6d4;hpb=f9750932ea23f7ee94fff6d3b52aa95cf8db4a91;p=mesa.git

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c
index d7325ff37d2..d3e6e1ac937 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.c
+++ b/src/gallium/drivers/radeonsi/si_state_draw.c
@@ -706,7 +706,7 @@ static void si_emit_draw_packets(struct si_context *sctx,
 	}
 }
 
-void si_emit_cache_flush(struct si_context *sctx, struct r600_atom *atom)
+void si_emit_cache_flush(struct si_context *sctx)
 {
 	struct r600_common_context *rctx = &sctx->b;
 	struct radeon_winsys_cs *cs = rctx->gfx.cs;
@@ -1029,10 +1029,6 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 		r600_resource(info->indirect_params)->TC_L2_dirty = false;
 	}
 
-	/* Check flush flags. */
-	if (sctx->b.flags)
-		si_mark_atom_dirty(sctx, sctx->atoms.s.cache_flush);
-
 	/* Add buffer sizes for memory checking in need_cs_space. */
 	if (sctx->emit_scratch_reloc && sctx->scratch_buffer)
 		r600_context_add_resource_size(ctx, &sctx->scratch_buffer->b.b);
@@ -1048,6 +1044,10 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info)
 	if (!si_upload_vertex_buffer_descriptors(sctx))
 		return;
 
+	/* Flushed caches prior to emitting states. */
+	if (sctx->b.flags)
+		si_emit_cache_flush(sctx);
+
 	/* Emit states. */
 	mask = sctx->dirty_atoms;
 	while (mask) {