From 8023e89d1199038d9825961288e020b9749ed0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Sat, 22 Jun 2024 04:39:37 -0400
Subject: [PATCH] ac/nir/cdna: ignore image_descriptor intrinsics

Fixes: 30af861bff71c7ec - radeonsi: restructure (rewrite) the compute blit shader

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29852>
---
 src/amd/common/ac_nir_lower_image_opcodes_cdna.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/amd/common/ac_nir_lower_image_opcodes_cdna.c b/src/amd/common/ac_nir_lower_image_opcodes_cdna.c
index 91c78c6560f..2f046d0f927 100644
--- a/src/amd/common/ac_nir_lower_image_opcodes_cdna.c
+++ b/src/amd/common/ac_nir_lower_image_opcodes_cdna.c
@@ -343,6 +343,12 @@ static bool lower_image_opcodes(nir_builder *b, nir_instr *instr, void *data)
                                                   32, intr->src[0].ssa);
          break;
 
+      /* These don't need any lowering. */
+      case nir_intrinsic_image_descriptor_amd:
+      case nir_intrinsic_image_deref_descriptor_amd:
+      case nir_intrinsic_bindless_image_descriptor_amd:
+         return false;
+
       default:
          intr_name = nir_intrinsic_infos[intr->intrinsic].name;