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

nir: rename atomic_add_gs_invocation_count_amd to make it more generic

Browse source 
It will be re-used to implement mesh/tash shader invocations queries.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25331>
This commit is contained in:
Samuel Pitoiset 2023-09-21 08:38:09 +02:00 • committed by Marge Bot
parent 1c1aa579ff
commit 1ce80653b2
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/common/ac_nir.c
View file

@ -942,7 +942,7 @@ ac_nir_gs_shader_query(nir_builder *b,
if (count)
nir_atomic_add_gs_emit_prim_count_amd(b, count);
nir_atomic_add_gs_invocation_count_amd(b, num_active_threads);
nir_atomic_add_shader_invocation_count_amd(b, num_active_threads);
}
nir_pop_if(b, if_pipeline_query);
}

2
src/amd/vulkan/nir/radv_nir_lower_abi.c
View file

@ -390,7 +390,7 @@ lower_abi_instr(nir_builder *b, nir_intrinsic_instr *intrin, void *state)
nir_imm_int(b, RADV_SHADER_QUERY_PRIM_XFB_OFFSET(nir_intrinsic_stream_id(intrin))),
nir_imm_int(b, 0x100));
break;
case nir_intrinsic_atomic_add_gs_invocation_count_amd:
case nir_intrinsic_atomic_add_shader_invocation_count_amd:
nir_gds_atomic_add_amd(b, 32, intrin->src[0].ssa, nir_imm_int(b, RADV_SHADER_QUERY_GS_INVOCATION_OFFSET),
nir_imm_int(b, 0x100));
break;

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

@ -1605,9 +1605,9 @@ intrinsic("atomic_add_gs_emit_prim_count_amd", [1])
intrinsic("atomic_add_gen_prim_count_amd", [1], indices=[STREAM_ID])
intrinsic("atomic_add_xfb_prim_count_amd", [1], indices=[STREAM_ID])
# Atomically add current wave's invocation count to query result
# Atomically add current shader's invocation count to query result
# src[] = { invocation_count }.
intrinsic("atomic_add_gs_invocation_count_amd", [1])
intrinsic("atomic_add_shader_invocation_count_amd", [1])
# LDS offset for scratch section in NGG shader
system_value("lds_ngg_scratch_base_amd", 1)

2
src/gallium/drivers/radeonsi/si_nir_lower_abi.c
View file

@ -470,7 +470,7 @@ static bool lower_intrinsic(nir_builder *b, nir_instr *instr, struct lower_abi_s
break;
}
case nir_intrinsic_atomic_add_gs_emit_prim_count_amd:
case nir_intrinsic_atomic_add_gs_invocation_count_amd: {
case nir_intrinsic_atomic_add_shader_invocation_count_amd: {
nir_def *buf =
si_nir_load_internal_binding(b, args, SI_GS_QUERY_EMULATED_COUNTERS_BUF, 4);