fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 00:10:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nir: Fix handling of NV_mesh_shader PRIMITIVE_INDICES output.

Browse source 
PRIMITIVE_INDICES is a flat array in NV_mesh_shader,
not a proper arrayed output, as opposed to D3D-style
mesh shaders where it's addressed by the primitive index.

Prevent assigning several slots to primitive indices,
to avoid issues.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Acked-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15160>
This commit is contained in:
Timur Kristóf 2022-02-23 15:01:05 +01:00 • committed by Marge Bot
parent d068eb53e8
commit 5b9bf3434f
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/nir/nir_gather_info.c
View file

@ -173,7 +173,8 @@ mark_whole_variable(nir_shader *shader, nir_variable *var,
if (nir_is_arrayed_io(var, shader->info.stage) ||
/* For NV_mesh_shader. */
(shader->info.stage == MESA_SHADER_MESH &&
var->data.location == VARYING_SLOT_PRIMITIVE_INDICES)) {
var->data.location == VARYING_SLOT_PRIMITIVE_INDICES &&
!var->data.per_primitive)) {
assert(glsl_type_is_array(type));
type = glsl_get_array_element(type);
}

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

@ -156,7 +156,7 @@ nir_is_arrayed_io(const nir_variable *var, gl_shader_stage stage)
if (stage == MESA_SHADER_MESH) {
/* NV_mesh_shader: this is flat array for the whole workgroup. */
if (var->data.location == VARYING_SLOT_PRIMITIVE_INDICES)
return false;
return var->data.per_primitive;
}
if (var->data.mode == nir_var_shader_in)
@ -181,6 +181,18 @@ static unsigned get_number_of_slots(struct lower_io_state *state,
type = glsl_get_array_element(type);
}
/* NV_mesh_shader:
* PRIMITIVE_INDICES is a flat array, not a proper arrayed output,
* as opposed to D3D-style mesh shaders where it's addressed by
* the primitive index.
* Prevent assigning several slots to primitive indices,
* to avoid some issues.
*/
if (state->builder.shader->info.stage == MESA_SHADER_MESH &&
var->data.location == VARYING_SLOT_PRIMITIVE_INDICES &&
!nir_is_arrayed_io(var, state->builder.shader->info.stage))
return 1;
return state->type_size(type, var->data.bindless);
}
@ -453,12 +465,6 @@ emit_store(struct lower_io_state *state, nir_ssa_def *data,
semantics.per_view = var->data.per_view;
semantics.invariant = var->data.invariant;
/* NV_mesh_shader: prevent assigning several slots to primitive indices. */
if (b->shader->info.stage == MESA_SHADER_MESH &&
var->data.location == VARYING_SLOT_PRIMITIVE_INDICES &&
!nir_is_arrayed_io(var, b->shader->info.stage))
semantics.num_slots = 1;
nir_intrinsic_set_io_semantics(store, semantics);
nir_builder_instr_insert(b, &store->instr);