From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 6 Feb 2020 02:58:23 +0000 (-0800)
Subject: iris: Insert buffer barrier in existing cache flush helpers.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=878c770d13df355432da053c015b7701b3c533e1;p=mesa.git

iris: Insert buffer barrier in existing cache flush helpers.

As a first step to phasing out the current hashtable-based depth and
render cache tracking mechanisms.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3875>
---

diff --git a/src/gallium/drivers/iris/iris_resolve.c b/src/gallium/drivers/iris/iris_resolve.c
index 1b0c22fc09a..040bb91038e 100644
--- a/src/gallium/drivers/iris/iris_resolve.c
+++ b/src/gallium/drivers/iris/iris_resolve.c
@@ -388,6 +388,8 @@ iris_cache_flush_for_read(struct iris_batch *batch,
    if (_mesa_hash_table_search_pre_hashed(batch->cache.render, bo->hash, bo) ||
        _mesa_set_search_pre_hashed(batch->cache.depth, bo->hash, bo))
       iris_flush_depth_and_render_caches(batch);
+
+   iris_emit_buffer_barrier_for(batch, bo, IRIS_DOMAIN_OTHER_READ);
 }
 
 static void *
@@ -402,6 +404,8 @@ iris_cache_flush_for_render(struct iris_batch *batch,
                             enum isl_format format,
                             enum isl_aux_usage aux_usage)
 {
+   iris_emit_buffer_barrier_for(batch, bo, IRIS_DOMAIN_RENDER_WRITE);
+
    if (_mesa_set_search_pre_hashed(batch->cache.depth, bo->hash, bo))
       iris_flush_depth_and_render_caches(batch);
 
@@ -461,6 +465,8 @@ iris_cache_flush_for_depth(struct iris_batch *batch,
 {
    if (_mesa_hash_table_search_pre_hashed(batch->cache.render, bo->hash, bo))
       iris_flush_depth_and_render_caches(batch);
+
+   iris_emit_buffer_barrier_for(batch, bo, IRIS_DOMAIN_DEPTH_WRITE);
 }
 
 void