From b21098779dacc128e919b6ace6c180501a03618c Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Tue, 16 May 2023 16:11:21 +0800 Subject: [PATCH] ac/llvm,radeonsi: lower nir_load_ordered_id_amd in abi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit aco does not implement it. Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- src/amd/llvm/ac_nir_to_llvm.c | 3 --- src/gallium/drivers/radeonsi/si_nir_lower_abi.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c index 1fef61d725f..00ae4001fb4 100644 --- a/src/amd/llvm/ac_nir_to_llvm.c +++ b/src/amd/llvm/ac_nir_to_llvm.c @@ -3208,9 +3208,6 @@ static bool visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins case nir_intrinsic_load_lds_ngg_gs_out_vertex_base_amd: result = ctx->abi->intrinsic_load(ctx->abi, instr); break; - case nir_intrinsic_load_ordered_id_amd: - result = ac_unpack_param(&ctx->ac, ac_get_arg(&ctx->ac, ctx->args->gs_tg_info), 0, 12); - break; case nir_intrinsic_load_vertex_id_zero_base: result = ctx->abi->vertex_id_replaced ? ctx->abi->vertex_id_replaced : ctx->abi->vertex_id; break; diff --git a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c index 0a7c620a289..3a0ce9c2c60 100644 --- a/src/gallium/drivers/radeonsi/si_nir_lower_abi.c +++ b/src/gallium/drivers/radeonsi/si_nir_lower_abi.c @@ -537,6 +537,9 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s case nir_intrinsic_load_packed_passthrough_primitive_amd: replacement = ac_nir_load_arg(b, &args->ac, args->ac.gs_vtx_offset[0]); break; + case nir_intrinsic_load_ordered_id_amd: + replacement = ac_nir_unpack_arg(b, &args->ac, args->ac.gs_tg_info, 0, 12); + break; default: return false; }