diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2020-11-16 18:42:44 -0500 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-11-19 11:04:48 -0800 |
| commit | 6b6f850afdbbe4a7df1628a4b5b951719ba15997 (patch) | |
| tree | 7fd4ee59a67b56d7289d97b5284018a7200b71a6 | |
| parent | 5c7eb3da128108a1b9a2e5affec3921df799aebb (diff) | |
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@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7542>
(cherry picked from commit ff22fcf4500e74fa518f5667b442931fee5ba85a)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_nir.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 9e515dc0af7..c98f59dcd6e 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 727a5160866..0ec574e761e 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -288,6 +288,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->writes_memory = true; info->num_memory_instructions++; /* we only care about stores */ |