From d8e10e6346c1bb55908b827cd4e911c047ef70e7 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 18 Aug 2023 12:52:40 -0400 Subject: [PATCH] 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: 586da7b3290 ("nir: Add nir_lower_helper_writes pass") Signed-off-by: Alyssa Rosenzweig Reviewed-by: Italo Nicola Reviewed-by: Faith Ekstrand Part-of: (cherry picked from commit 04ba4059b7243fb9258df12154ce1e7a01e019c8) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_helper_writes.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index d69d1b1f4ee..8b0b68e6afd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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 diff --git a/src/compiler/nir/nir_lower_helper_writes.c b/src/compiler/nir/nir_lower_helper_writes.c index 49ffedc4234..bd88e7f142b 100644 --- a/src/compiler/nir/nir_lower_helper_writes.c +++ b/src/compiler/nir/nir_lower_helper_writes.c @@ -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