From c57b4c86c07adce6738c01fae5906f4a4a46d93f Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 20 Jun 2019 10:02:42 -0500 Subject: [PATCH] iris: Use render_batch/compute_batch locals in memory_barrier We have them, may as well use them. --- src/gallium/drivers/iris/iris_pipe_control.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_pipe_control.c b/src/gallium/drivers/iris/iris_pipe_control.c index 3d12a5b..f686ef7 100644 --- a/src/gallium/drivers/iris/iris_pipe_control.c +++ b/src/gallium/drivers/iris/iris_pipe_control.c @@ -155,18 +155,18 @@ iris_texture_barrier(struct pipe_context *ctx, unsigned flags) if (render_batch->contains_draw || render_batch->cache.render->entries || render_batch->cache.depth->entries) { - iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_RENDER], + iris_emit_pipe_control_flush(render_batch, PIPE_CONTROL_DEPTH_CACHE_FLUSH | PIPE_CONTROL_RENDER_TARGET_FLUSH | PIPE_CONTROL_CS_STALL); - iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_RENDER], + iris_emit_pipe_control_flush(render_batch, PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE); } if (compute_batch->contains_draw) { - iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_COMPUTE], + iris_emit_pipe_control_flush(compute_batch, PIPE_CONTROL_CS_STALL); - iris_emit_pipe_control_flush(&ice->batches[IRIS_BATCH_COMPUTE], + iris_emit_pipe_control_flush(compute_batch, PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE); } } -- 2.7.4