nir/lower_helper_writes: Consider bindless images

These need to be handled like other image ops.

Fixes KHR-GLES31.core.shader_image_load_store.basic-allTargets-atomicFS on Asahi
with bindless image access forced.

Fixes: 586da7b329 ("nir: Add nir_lower_helper_writes pass")
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Italo Nicola <italonicola@collabora.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24778>
(cherry picked from commit 04ba4059b7)
This commit is contained in:
Alyssa Rosenzweig 2023-08-18 12:52:40 -04:00 committed by Dylan Baker
parent dba163b599
commit d8e10e6346
2 changed files with 4 additions and 1 deletions

View file

@ -5604,7 +5604,7 @@
"description": "nir/lower_helper_writes: Consider bindless images",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "586da7b32908eb6cb4282a58339689b6d23c224b",
"notes": null

View file

@ -39,9 +39,12 @@ lower(nir_builder *b, nir_instr *instr, void *data)
case nir_intrinsic_global_atomic_swap:
case nir_intrinsic_image_atomic:
case nir_intrinsic_image_atomic_swap:
case nir_intrinsic_bindless_image_atomic:
case nir_intrinsic_bindless_image_atomic_swap:
break;
case nir_intrinsic_store_global:
case nir_intrinsic_image_store:
case nir_intrinsic_bindless_image_store:
if (!(*lower_plain_stores))
return false;
else