fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nir: remove resource/sampler heap ptrs sysvals

Browse source 
They are no longer used.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40768>
This commit is contained in:
Samuel Pitoiset 2026-04-03 13:31:53 +02:00 • committed by Marge Bot
parent d2b9ccf20b
commit 74aa40f6ed
6 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/compiler/nir/nir.c
View file

@ -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;
}

2
src/compiler/nir/nir_divergence_analysis.c
View file

@ -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;

3
src/compiler/nir/nir_intrinsics.py
View file

@ -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])

2
src/compiler/shader_enums.c
View file

@ -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);

4
src/compiler/shader_enums.h
View file

@ -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;

2
src/compiler/spirv/vtn_variables.c
View file

@ -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;