fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 01:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Assign locations correctly for arrayed IO

Browse source 
Arrayed IO, encountered in tessellation shaders, should not take up
multiple driver locations.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
George Ouzounoudis 2022-10-24 22:21:29 +03:00 • committed by Marge Bot
parent 304636297f
commit 76e02c7f77
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/nouveau/vulkan/nvk_shader.c
View file

@ -271,18 +271,36 @@ count_location_slots(const struct glsl_type *type, bool bindless)
static void
assign_io_locations(nir_shader *nir)
{
if (nir->info.stage != MESA_SHADER_VERTEX)
nir_assign_var_locations(nir, nir_var_shader_in, &nir->num_inputs,
count_location_slots);
else {
if (nir->info.stage != MESA_SHADER_VERTEX) {
unsigned location = 0;
nir_foreach_variable_with_modes(var, nir, nir_var_shader_in) {
var->data.driver_location = location;
if (nir_is_arrayed_io(var, nir->info.stage)) {
location += glsl_count_attribute_slots(glsl_get_array_element(var->type), false);
} else {
location += glsl_count_attribute_slots(var->type, false);
}
}
nir->num_inputs = location;
} else {
nir_foreach_shader_in_variable(var, nir) {
assert(var->data.location >= VERT_ATTRIB_GENERIC0);
var->data.driver_location = var->data.location - VERT_ATTRIB_GENERIC0;
}
}
nir_assign_var_locations(nir, nir_var_shader_out, &nir->num_outputs,
count_location_slots);
{
unsigned location = 0;
nir_foreach_variable_with_modes(var, nir, nir_var_shader_out) {
var->data.driver_location = location;
if (nir_is_arrayed_io(var, nir->info.stage)) {
location += glsl_count_attribute_slots(glsl_get_array_element(var->type), false);
} else {
location += glsl_count_attribute_slots(var->type, false);
}
}
nir->num_outputs = location;
}
}
void