AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Cleanup divergence analysis for mesh shaders.

Browse Source 
1. Mesh shaders don't have inputs (only task payload),
so remove them from handling load_input.

2. Clarify in comments that loading any mesh shader
output is an NV_mesh_shader only feature.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27680>
This commit is contained in:
Timur Kristóf
2024-02-08 11:29:11 +01:00
committed by Marge Bot
parent 9553d67373
commit 870a2e4197
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_divergence_analysis.c
+6 -2
View File
@@ -262,7 +262,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr,
is_divergent |= !(options & nir_divergence_single_prim_per_subgroup);
else if (stage == MESA_SHADER_TESS_EVAL)
is_divergent |= !(options & nir_divergence_single_patch_per_tes_subgroup);
else if (stage != MESA_SHADER_MESH)
else
is_divergent = true;
break;
case nir_intrinsic_load_per_vertex_input:
@@ -291,13 +291,16 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr,
break;
case MESA_SHADER_TASK:
case MESA_SHADER_MESH:
/* Divergent if src[0] is, so nothing else to do. */
/* NV_mesh_shader only (EXT_mesh_shader does not allow loading outputs).
* Divergent if src[0] is, so nothing else to do.
*/
break;
default:
unreachable("Invalid stage for load_output");
}
break;
case nir_intrinsic_load_per_vertex_output:
/* TCS and NV_mesh_shader only (EXT_mesh_shader does not allow loading outputs). */
assert(stage == MESA_SHADER_TESS_CTRL || stage == MESA_SHADER_MESH);
is_divergent = instr->src[0].ssa->divergent ||
instr->src[1].ssa->divergent ||
@@ -305,6 +308,7 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr,
!(options & nir_divergence_single_patch_per_tcs_subgroup));
break;
case nir_intrinsic_load_per_primitive_output:
/* NV_mesh_shader only (EXT_mesh_shader does not allow loading outputs). */
assert(stage == MESA_SHADER_MESH);
is_divergent = instr->src[0].ssa->divergent ||
instr->src[1].ssa->divergent;