From 74aa40f6ed23e1726d7b57934f439580d816c7e3 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 3 Apr 2026 13:31:53 +0200 Subject: [PATCH] nir: remove resource/sampler heap ptrs sysvals They are no longer used. Signed-off-by: Samuel Pitoiset Part-of: --- src/compiler/nir/nir.c | 8 -------- src/compiler/nir/nir_divergence_analysis.c | 2 -- src/compiler/nir/nir_intrinsics.py | 3 --- src/compiler/shader_enums.c | 2 -- src/compiler/shader_enums.h | 4 ---- src/compiler/spirv/vtn_variables.c | 2 -- 6 files changed, 21 deletions(-) diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c index 9604154aef7..fb193e20cf3 100644 --- a/src/compiler/nir/nir.c +++ b/src/compiler/nir/nir.c @@ -2574,10 +2574,6 @@ nir_intrinsic_from_system_value(gl_system_value val) return nir_intrinsic_load_warp_id_arm; case SYSTEM_VALUE_WARP_MAX_ID_ARM: return nir_intrinsic_load_warp_max_id_arm; - case SYSTEM_VALUE_SAMPLER_HEAP_PTR: - return nir_intrinsic_load_sampler_heap_ptr; - case SYSTEM_VALUE_RESOURCE_HEAP_PTR: - return nir_intrinsic_load_resource_heap_ptr; default: return nir_num_intrinsics; } @@ -2764,10 +2760,6 @@ nir_system_value_from_intrinsic(nir_intrinsic_op intrin) return SYSTEM_VALUE_WARP_ID_ARM; case nir_intrinsic_load_warp_max_id_arm: return SYSTEM_VALUE_WARP_MAX_ID_ARM; - case nir_intrinsic_load_sampler_heap_ptr: - return SYSTEM_VALUE_SAMPLER_HEAP_PTR; - case nir_intrinsic_load_resource_heap_ptr: - return SYSTEM_VALUE_RESOURCE_HEAP_PTR; default: return SYSTEM_VALUE_MAX; } diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index 218f2ec631f..8fad5402a45 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -365,8 +365,6 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) case nir_intrinsic_load_call_return_address_amd: case nir_intrinsic_load_indirect_address_intel: case nir_intrinsic_load_alpha_to_coverage_enable_ir3: - case nir_intrinsic_load_sampler_heap_ptr: - case nir_intrinsic_load_resource_heap_ptr: is_divergent = false; break; diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index de8f67020d9..cdebefedbb3 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -1454,9 +1454,6 @@ intrinsic("cmat_insert", src_comp=[-1, 1, -1, 1]) intrinsic("cmat_copy", src_comp=[-1, -1]) intrinsic("cmat_transpose", src_comp=[-1, -1], indices=[FP_MATH_CTRL]) -# VK_EXT_descriptor_heap -system_value("sampler_heap_ptr", 1, bit_sizes=[64]) -system_value("resource_heap_ptr", 1, bit_sizes=[64]) # src[] = { deref }. load("buffer_ptr_deref", [-1], [ACCESS, RESOURCE_TYPE], flags=[CAN_ELIMINATE, CAN_REORDER]) diff --git a/src/compiler/shader_enums.c b/src/compiler/shader_enums.c index 4e59f5b3e37..1d5a2bc2438 100644 --- a/src/compiler/shader_enums.c +++ b/src/compiler/shader_enums.c @@ -459,8 +459,6 @@ gl_system_value_name(gl_system_value sysval) ENUM(SYSTEM_VALUE_CORE_MAX_ID_ARM), ENUM(SYSTEM_VALUE_WARP_ID_ARM), ENUM(SYSTEM_VALUE_WARP_MAX_ID_ARM), - ENUM(SYSTEM_VALUE_SAMPLER_HEAP_PTR), - ENUM(SYSTEM_VALUE_RESOURCE_HEAP_PTR), }; STATIC_ASSERT(ARRAY_SIZE(names) == SYSTEM_VALUE_MAX); return NAME(sysval); diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h index 6f9f37f8961..a45fda6458a 100644 --- a/src/compiler/shader_enums.h +++ b/src/compiler/shader_enums.h @@ -969,10 +969,6 @@ typedef enum SYSTEM_VALUE_WARP_ID_ARM, SYSTEM_VALUE_WARP_MAX_ID_ARM, - /* SPV_EXT_descriptor_heap */ - SYSTEM_VALUE_SAMPLER_HEAP_PTR, - SYSTEM_VALUE_RESOURCE_HEAP_PTR, - SYSTEM_VALUE_MAX /**< Number of values */ } gl_system_value; diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c index 847f3b7d4e6..221e3af75f5 100644 --- a/src/compiler/spirv/vtn_variables.c +++ b/src/compiler/spirv/vtn_variables.c @@ -1320,11 +1320,9 @@ vtn_get_builtin_location(struct vtn_builder *b, break; case SpvBuiltInSamplerHeapEXT: - *location = SYSTEM_VALUE_SAMPLER_HEAP_PTR; *mode = nir_var_sampler_heap; break; case SpvBuiltInResourceHeapEXT: - *location = SYSTEM_VALUE_RESOURCE_HEAP_PTR; *mode = nir_var_resource_heap; break;