From 4bec453595333a1ecde25c5854cbdae85ecff360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Tue, 28 Jan 2025 13:10:35 +0100 Subject: [PATCH] ac/nir/ngg: Use ac_nir_ngg_alloc_vertices_and_primitives in mesh shader lowering. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/amd/common/nir/ac_nir_lower_ngg_mesh.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/amd/common/nir/ac_nir_lower_ngg_mesh.c b/src/amd/common/nir/ac_nir_lower_ngg_mesh.c index 160701083f8..e73c828c30d 100644 --- a/src/amd/common/nir/ac_nir_lower_ngg_mesh.c +++ b/src/amd/common/nir/ac_nir_lower_ngg_mesh.c @@ -668,8 +668,7 @@ set_ms_final_output_counts(nir_builder *b, if (s->hw_workgroup_size <= s->wave_size) { /* Single-wave mesh shader workgroup. */ - nir_def *m0 = nir_ior(b, nir_ishl_imm(b, num_prm, 12), num_vtx); - nir_sendmsg_amd(b, m0, .base = AC_SENDMSG_GS_ALLOC_REQ); + ac_nir_ngg_alloc_vertices_and_primitives(b, num_vtx, num_prm, false); *out_num_prm = num_prm; *out_num_vtx = num_vtx; @@ -701,8 +700,7 @@ set_ms_final_output_counts(nir_builder *b, .memory_semantics = NIR_MEMORY_ACQ_REL, .memory_modes = nir_var_mem_shared); - nir_def *m0 = nir_ior(b, nir_ishl_imm(b, num_prm, 12), num_vtx); - nir_sendmsg_amd(b, m0, .base = AC_SENDMSG_GS_ALLOC_REQ); + ac_nir_ngg_alloc_vertices_and_primitives(b, num_vtx, num_prm, false); } nir_push_else(b, if_wave_0); {