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

ac/nir: add emit_ms_outputs helper

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25040>
This commit is contained in:
Rhys Perry 2023-09-01 17:13:20 +01:00 • committed by Marge Bot
parent 23cb0b00db
commit c300a496ea
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4495,6 +4495,21 @@ emit_ms_primitive(nir_builder *b, nir_def *index, nir_def *row, bool exports, bo
}
}
static void
emit_ms_outputs(nir_builder *b, nir_def *invocation_index, nir_def *row_start,
nir_def *count, bool exports, bool parameters, uint64_t mask,
void (*cb)(nir_builder *, nir_def *, nir_def *, bool, bool,
uint64_t, lower_ngg_ms_state *),
lower_ngg_ms_state *s)
{
nir_def *has_output = nir_ilt(b, invocation_index, count);
nir_if *if_has_output = nir_push_if(b, has_output);
{
cb(b, invocation_index, row_start, exports, parameters, mask, s);
}
nir_pop_if(b, if_has_output);
}
static void
emit_ms_finale(nir_builder *b, lower_ngg_ms_state *s)
{
@ -4546,22 +4561,14 @@ emit_ms_finale(nir_builder *b, lower_ngg_ms_state *s)
/* Export vertices. */
if ((per_vertex_outputs & ~VARYING_BIT_POS) || !wait_attr_ring) {
nir_def *has_output_vertex = nir_ilt(b, invocation_index, num_vtx);
nir_if *if_has_output_vertex = nir_push_if(b, has_output_vertex);
{
emit_ms_vertex(b, invocation_index, row_start, !wait_attr_ring, true, per_vertex_outputs, s);
}
nir_pop_if(b, if_has_output_vertex);
emit_ms_outputs(b, invocation_index, row_start, num_vtx, !wait_attr_ring, true,
per_vertex_outputs, &emit_ms_vertex, s);
}
/* Export primitives. */
if (per_primitive_outputs || !wait_attr_ring) {
nir_def *has_output_primitive = nir_ilt(b, invocation_index, num_prm);
nir_if *if_has_output_primitive = nir_push_if(b, has_output_primitive);
{
emit_ms_primitive(b, invocation_index, row_start, !wait_attr_ring, true, per_primitive_outputs, s);
}
nir_pop_if(b, if_has_output_primitive);
emit_ms_outputs(b, invocation_index, row_start, num_prm, !wait_attr_ring, true,
per_primitive_outputs, &emit_ms_primitive, s);
}
/* When we need to wait for attribute ring stores, we emit both position and primitive
@ -4575,20 +4582,11 @@ emit_ms_finale(nir_builder *b, lower_ngg_ms_state *s)
.memory_semantics = NIR_MEMORY_RELEASE,
.memory_modes = nir_var_shader_out);
/* Position export only */
nir_def *has_output_vertex = nir_ilt(b, invocation_index, num_vtx);
nir_if *if_has_output_vertex = nir_push_if(b, has_output_vertex);
{
emit_ms_vertex(b, invocation_index, row_start, true, false, per_vertex_outputs, s);
}
nir_pop_if(b, if_has_output_vertex);
nir_def *has_output_primitive = nir_ilt(b, invocation_index, num_prm);
nir_if *if_has_output_primitive = nir_push_if(b, has_output_primitive);
{
emit_ms_primitive(b, invocation_index, row_start, true, false, per_primitive_outputs, s);
}
nir_pop_if(b, if_has_output_primitive);
/* Position/primitive export only */
emit_ms_outputs(b, invocation_index, row_start, num_vtx, true, false,
per_vertex_outputs, &emit_ms_vertex, s);
emit_ms_outputs(b, invocation_index, row_start, num_prm, true, false,
per_primitive_outputs, &emit_ms_primitive, s);
}
}