From: Kenneth Graunke <kenneth@whitecape.org>
Date: Fri, 19 Oct 2018 08:40:06 +0000 (-0700)
Subject: iris: hack to avoid memorybarriers out the wazoo
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b2d223b6bf4d0c099d5e9644119ee08441a1b926;p=mesa.git

iris: hack to avoid memorybarriers out the wazoo

we don't want to emit piles of pipe controls to a compute batch if
it isn't necessary...

prevents double-batch-wraps in cs-op-selection-bool-bvec4-bvec4
(but it's still kinda a big ol' hack...)
---

diff --git a/src/gallium/drivers/iris/iris_pipe_control.c b/src/gallium/drivers/iris/iris_pipe_control.c
index fe937614150..5b9935398d3 100644
--- a/src/gallium/drivers/iris/iris_pipe_control.c
+++ b/src/gallium/drivers/iris/iris_pipe_control.c
@@ -182,10 +182,14 @@ iris_memory_barrier(struct pipe_context *ctx, unsigned flags)
    }
 
    // XXX: MAPPED_BUFFER, QUERY_BUFFER, STREAMOUT_BUFFER, GLOBAL_BUFFER?
-   // XXX: compute batch?
 
-   iris_emit_pipe_control_flush(&ice->render_batch, bits);
-   iris_emit_pipe_control_flush(&ice->compute_batch, bits);
+   // XXX: don't unconditionally emit flushes in both engines, we don't
+   // even know if we're even using e.g. the compute engine...
+
+   if (ice->render_batch.contains_draw)
+      iris_emit_pipe_control_flush(&ice->render_batch, bits);
+   if (ice->compute_batch.contains_draw)
+      iris_emit_pipe_control_flush(&ice->compute_batch, bits);
 }
 
 void