Mesa (master): nir/lower_memory_model: do not break with global atomic operations

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 39098a2053d4619faff8bc125eac412270a1bdec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39098a2053d4619faff8bc125eac412270a1bdec

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Sep 28 11:47:50 2020 +0200

nir/lower_memory_model: do not break with global atomic operations

Global atomics don't have an access flag.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6888>

---

 src/compiler/nir/nir_lower_memory_model.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/compiler/nir/nir_lower_memory_model.c b/src/compiler/nir/nir_lower_memory_model.c
index 068dfc1af79..d2ba829c89c 100644
--- a/src/compiler/nir/nir_lower_memory_model.c
+++ b/src/compiler/nir/nir_lower_memory_model.c
@@ -159,6 +159,9 @@ visit_instr(nir_instr *instr, uint32_t *cur_modes, unsigned vis_avail_sem)
    if (!writes && vis_avail_sem == NIR_MEMORY_MAKE_AVAILABLE)
       return false;
 
+   if (!nir_intrinsic_has_access(intrin))
+      return false;
+
    unsigned access = nir_intrinsic_access(intrin);
 
    if (access & (ACCESS_NON_READABLE | ACCESS_NON_WRITEABLE | ACCESS_CAN_REORDER | ACCESS_COHERENT))