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

st/glsl_to_nir: fix driver location for dual-slot packed doubles

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2018-03-21 11:27:19 +11:00
parent 47eee04556
commit fc51fdbcde
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/state_tracker/st_glsl_to_nir.cpp
View file

@ -141,16 +141,23 @@ st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size,
type = glsl_get_array_element(type); type = glsl_get_array_element(type);
} }
unsigned var_size = type_size(type);
/* Builtins don't allow component packing so we only need to worry about /* Builtins don't allow component packing so we only need to worry about
* user defined varyings sharing the same location. * user defined varyings sharing the same location.
*/ */
bool processed = false; bool processed = false;
if (var->data.location >= base) { if (var->data.location >= base) {
unsigned glsl_location = var->data.location - base; unsigned glsl_location = var->data.location - base;
if (processed_locs[var->data.index] & ((uint64_t)1 << glsl_location))
for (unsigned i = 0; i < var_size; i++) {
if (processed_locs[var->data.index] &
((uint64_t)1 << (glsl_location + i)))
processed = true; processed = true;
else else
processed_locs[var->data.index] |= ((uint64_t)1 << glsl_location); processed_locs[var->data.index] |=
((uint64_t)1 << (glsl_location + i));
}
} }
/* Because component packing allows varyings to share the same location /* Because component packing allows varyings to share the same location
@ -162,9 +169,12 @@ st_nir_assign_var_locations(struct exec_list *var_list, unsigned *size,
continue; continue;
} }
assigned_locations[var->data.location] = location; for (unsigned i = 0; i < var_size; i++) {
assigned_locations[var->data.location + i] = location + i;
}
var->data.driver_location = location; var->data.driver_location = location;
location += type_size(type); location += var_size;
} }
*size += location; *size += location;