From eda401cd9ab7d94d74beffa72cdb92f651734c62 Mon Sep 17 00:00:00 2001 From: Simon Perretta Date: Thu, 14 May 2026 09:29:51 +0100 Subject: [PATCH] pco: drop global path for null descriptor checking Global I/O intrinsics don't have an index offset, and can't directly be mapped to descriptors. Signed-off-by: Simon Perretta Acked-by: Frank Binns Part-of: --- src/imagination/pco/pco_internal.h | 7 +++---- .../pco/pco_nir_lower_null_descriptors.c | 14 -------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/imagination/pco/pco_internal.h b/src/imagination/pco/pco_internal.h index 97a290c542c..2fcc205914c 100644 --- a/src/imagination/pco/pco_internal.h +++ b/src/imagination/pco/pco_internal.h @@ -1827,11 +1827,10 @@ bool pco_shrink_vecs(pco_shader *shader); typedef enum { pco_nir_lower_null_descriptor_ubo = (1 << 0), pco_nir_lower_null_descriptor_ssbo = (1 << 1), - pco_nir_lower_null_descriptor_global = (1 << 2), - pco_nir_lower_null_descriptor_texture = (1 << 3), - pco_nir_lower_null_descriptor_image = (1 << 4), + pco_nir_lower_null_descriptor_texture = (1 << 2), + pco_nir_lower_null_descriptor_image = (1 << 3), - pco_nir_lower_null_descriptor_all = BITFIELD_MASK(5), + pco_nir_lower_null_descriptor_all = BITFIELD_MASK(4), } pco_nir_lower_null_descriptor_options; bool pco_nir_lower_null_descriptors( diff --git a/src/imagination/pco/pco_nir_lower_null_descriptors.c b/src/imagination/pco/pco_nir_lower_null_descriptors.c index 881415e9423..0b0a3d1fd98 100644 --- a/src/imagination/pco/pco_nir_lower_null_descriptors.c +++ b/src/imagination/pco/pco_nir_lower_null_descriptors.c @@ -34,20 +34,6 @@ static nir_def *get_is_null(nir_builder *b, is_deref = true; break; - case nir_intrinsic_load_global: - case nir_intrinsic_load_global_2x32: - case nir_intrinsic_load_global_constant: - case nir_intrinsic_global_atomic: - case nir_intrinsic_global_atomic_2x32: - case nir_intrinsic_global_atomic_swap: - case nir_intrinsic_global_atomic_swap_2x32: - case nir_intrinsic_store_global: - case nir_intrinsic_store_global_2x32: - if (!(options & pco_nir_lower_null_descriptor_global)) - return NULL; - - break; - case nir_intrinsic_get_ubo_size: case nir_intrinsic_load_ubo: if (!(options & pco_nir_lower_null_descriptor_ubo))