From 78fed5fc131197e880ac2a6773108b804b2e1a71 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Mon, 9 Jun 2025 14:07:20 +0800 Subject: [PATCH] ac,radv: move nir_load_task_ring_entry_amd to ac MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To be shared with radeonsi. Reviewed-by: Samuel Pitoiset Reviewed-by: Timur Kristóf Reviewed-by: Marek Olšák Part-of: --- src/amd/common/nir/ac_nir_lower_intrinsics_to_args.c | 3 +++ src/amd/vulkan/nir/radv_nir_lower_abi.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/common/nir/ac_nir_lower_intrinsics_to_args.c b/src/amd/common/nir/ac_nir_lower_intrinsics_to_args.c index 6114f6c454d..2c3bf077416 100644 --- a/src/amd/common/nir/ac_nir_lower_intrinsics_to_args.c +++ b/src/amd/common/nir/ac_nir_lower_intrinsics_to_args.c @@ -476,6 +476,9 @@ lower_intrinsic_to_arg(nir_builder *b, nir_intrinsic_instr *intrin, void *state) case nir_intrinsic_load_subgroup_invocation: replacement = nir_mbcnt_amd(b, nir_imm_intN_t(b, ~0ull, s->wave_size), nir_imm_int(b, 0)); break; + case nir_intrinsic_load_task_ring_entry_amd: + replacement = ac_nir_load_arg(b, s->args, s->args->task_ring_entry); + break; default: return false; } diff --git a/src/amd/vulkan/nir/radv_nir_lower_abi.c b/src/amd/vulkan/nir/radv_nir_lower_abi.c index 23cf8e75752..381a0b95d9c 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_abi.c +++ b/src/amd/vulkan/nir/radv_nir_lower_abi.c @@ -212,9 +212,6 @@ lower_abi_instr(nir_builder *b, nir_intrinsic_instr *intrin, void *state) replacement = nir_imul_imm(b, nir_iand_imm(b, ac_nir_load_arg(b, &s->args->ac, s->args->ac.gs_tg_info), 0xfff), RADV_MESH_SCRATCH_ENTRY_BYTES); break; - case nir_intrinsic_load_task_ring_entry_amd: - replacement = ac_nir_load_arg(b, &s->args->ac, s->args->ac.task_ring_entry); - break; case nir_intrinsic_load_lshs_vertex_stride_amd: { if (stage == MESA_SHADER_VERTEX) { replacement = nir_imm_int(b, get_tcs_input_vertex_stride(s->info->vs.num_linked_outputs));