From 240ee9564bea9adc290ccb448a8d051d18929a11 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sun, 13 Aug 2023 09:59:10 -0400
Subject: [PATCH] agx: Use more barriers

Fixes flakiness in
KHR-GLES31.core.texture_buffer.texture_buffer_atomic_functions.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24847>
---
 src/asahi/compiler/agx_compile.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index c67c7a469f5..7fc83151020 100644
--- a/src/asahi/compiler/agx_compile.c
+++ b/src/asahi/compiler/agx_compile.c
@@ -1126,6 +1126,12 @@ agx_emit_intrinsic(agx_builder *b, nir_intrinsic_instr *instr)
       /* Flush out the atomic to main memory */
       agx_memory_barrier(b);
 
+      /* TODO: Which ones do we actually need? */
+      agx_image_barrier_1(b);
+      agx_image_barrier_2(b);
+      agx_image_barrier_3(b);
+      agx_image_barrier_4(b);
+
       /* Flush out the texture cache */
       agx_flush_memory_to_texture(b);
       return NULL;