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

ac/nir: Reuse existing nir_builder for emit_ms_finale.

Browse source 
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15199>
This commit is contained in:
Timur Kristóf 2022-02-27 17:59:21 +01:00 • committed by Marge Bot
parent 74f1e7965e
commit d0f45c7c49
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/amd/common/ac_nir_lower_ngg.c
View file

@ -2367,18 +2367,10 @@ ms_emit_arrayed_outputs(nir_builder *b,
}
static void
emit_ms_finale(nir_shader *shader, lower_ngg_ms_state *s)
emit_ms_finale(nir_builder *b, lower_ngg_ms_state *s)
{
nir_function_impl *impl = nir_shader_get_entrypoint(shader);
assert(impl);
nir_block *last_block = nir_impl_last_block(impl);
assert(last_block);
/* We assume there is always a single end block in the shader. */
nir_builder builder;
nir_builder *b = &builder; /* This is to avoid the & */
nir_builder_init(b, impl);
nir_block *last_block = nir_impl_last_block(b->impl);
b->cursor = nir_after_block(last_block);
nir_scoped_barrier(b, .execution_scope=NIR_SCOPE_WORKGROUP, .memory_scope=NIR_SCOPE_WORKGROUP,
@ -2404,8 +2396,8 @@ emit_ms_finale(nir_shader *shader, lower_ngg_ms_state *s)
nir_pop_if(b, if_elected);
loaded_num_prm = nir_if_phi(b, loaded_num_prm, dont_care);
nir_ssa_def *num_prm = nir_read_first_invocation(b, loaded_num_prm);
nir_ssa_def *num_vtx = nir_imm_int(b, shader->info.mesh.max_vertices_out);
num_prm = nir_umin(b, num_prm, nir_imm_int(b, shader->info.mesh.max_primitives_out));
nir_ssa_def *num_vtx = nir_imm_int(b, b->shader->info.mesh.max_vertices_out);
num_prm = nir_umin(b, num_prm, nir_imm_int(b, b->shader->info.mesh.max_primitives_out));
/* If the shader doesn't actually create any primitives, don't allocate any output. */
num_vtx = nir_bcsel(b, nir_ieq_imm(b, num_prm, 0), nir_imm_int(b, 0), num_vtx);
@ -2686,7 +2678,7 @@ ac_nir_lower_ngg_ms(nir_shader *shader,
}
lower_ms_intrinsics(shader, &state);
emit_ms_finale(shader, &state);
emit_ms_finale(b, &state);
/* Cleanup */
nir_validate_shader(shader, "after emitting NGG MS");