Mesa (staging/20.3): radeonsi: fix scan_instruction for bindless inc_wrap/dec_wrap atomics

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 650e2a15ad327c3dc1f633e5ba29e02029c0ea8e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=650e2a15ad327c3dc1f633e5ba29e02029c0ea8e

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Nov 16 18:42:44 2020 -0500

radeonsi: fix scan_instruction for bindless inc_wrap/dec_wrap atomics

Fixes: 25fff591c1162 - radeonsi: add support for nir atomic_inc_wrap/atomic_dec_wrap

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit ff22fcf4500e74fa518f5667b442931fee5ba85a)

---

 .pick_status.json                            | 2 +-
 src/gallium/drivers/radeonsi/si_shader_nir.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 31492b7dfb8..99086b9cabb 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -562,7 +562,7 @@
         "description": "radeonsi: fix scan_instruction for bindless inc_wrap/dec_wrap atomics",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "25fff591c1162a9c1158b0e69de3a6edf89f42d4"
     },
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c
index 8b46ed8384e..553661fc960 100644
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c
@@ -229,6 +229,8 @@ static void scan_instruction(const struct nir_shader *nir, struct si_shader_info
       case nir_intrinsic_bindless_image_atomic_xor:
       case nir_intrinsic_bindless_image_atomic_exchange:
       case nir_intrinsic_bindless_image_atomic_comp_swap:
+      case nir_intrinsic_bindless_image_atomic_inc_wrap:
+      case nir_intrinsic_bindless_image_atomic_dec_wrap:
          info->uses_bindless_images = true;
          info->num_memory_stores++;
          break;