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

nir: lower io support task and mesh shader

Browse source 
mesh shader does not have input, and we skip task shader
IO lowering like compute shader.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36749>
This commit is contained in:
Qiang Yu 2025-07-15 10:09:08 +08:00 • committed by Marge Bot
parent dda1692484
commit 7c3f7e1046
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/nir/nir_lower_io.c
View file

@ -1137,10 +1137,12 @@ type_size_vec4(const struct glsl_type *type, bool bindless)
void
nir_lower_io_passes(nir_shader *nir, bool renumber_vs_inputs)
{
if (mesa_shader_stage_is_compute(nir->info.stage))
if (mesa_shader_stage_is_compute(nir->info.stage) ||
nir->info.stage == MESA_SHADER_TASK)
return;
bool lower_indirect_inputs =
nir->info.stage != MESA_SHADER_MESH &&
!(nir->options->support_indirect_inputs & BITFIELD_BIT(nir->info.stage));
/* Transform feedback requires that indirect outputs are lowered. */
@ -1169,7 +1171,8 @@ nir_lower_io_passes(nir_shader *nir, bool renumber_vs_inputs)
* must sort explicitly here to get what nir_assign_io_var_locations does.
*/
unsigned varying_var_mask =
(nir->info.stage != MESA_SHADER_VERTEX ? nir_var_shader_in : 0) |
(nir->info.stage != MESA_SHADER_VERTEX &&
nir->info.stage != MESA_SHADER_MESH ? nir_var_shader_in : 0) |
(nir->info.stage != MESA_SHADER_FRAGMENT ? nir_var_shader_out : 0);
nir_sort_variables_by_location(nir, varying_var_mask);
@ -1228,8 +1231,11 @@ nir_lower_io_passes(nir_shader *nir, bool renumber_vs_inputs)
*
* This must be done after DCE to remove dead load_input intrinsics.
*/
bool recompute_inputs =
(nir->info.stage != MESA_SHADER_VERTEX || renumber_vs_inputs) &&
nir->info.stage != MESA_SHADER_MESH;
NIR_PASS(_, nir, nir_recompute_io_bases,
(nir->info.stage != MESA_SHADER_VERTEX || renumber_vs_inputs ? nir_var_shader_in : 0) | nir_var_shader_out);
(recompute_inputs ? nir_var_shader_in : 0) | nir_var_shader_out);
if (nir->xfb_info)
NIR_PASS(_, nir, nir_io_add_intrinsic_xfb_info);

1
src/mesa/state_tracker/st_program.c
View file

@ -804,6 +804,7 @@ st_create_common_variant(struct st_context *st,
}
assert(state.ir.nir->info.stage == MESA_SHADER_COMPUTE ||
state.ir.nir->info.stage == MESA_SHADER_TASK ||
state.ir.nir->info.io_lowered);
/* This should be after all passes that touch IO. */