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

glsl: fix varying slot allocation for blocks and structs with explicit locations

Browse source 
Previously each member was being counted as using a single slot,
count_attribute_slots() fixes the count for array and struct members.

Also don't assign a negitive to the unsigned expl_location variable.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Timothy Arceri 2016-01-06 20:22:46 +11:00
parent 47dde2bd45
commit e58be8ac0e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/ast_to_hir.cpp
View file

@ -6375,12 +6375,13 @@ ast_process_struct_or_iface_block_members(exec_list *instructions,
if (process_qualifier_constant(state, &loc, "location",
qual->location, &qual_location)) {
fields[i].location = VARYING_SLOT_VAR0 + qual_location;
expl_location = fields[i].location + 1;
expl_location = fields[i].location +
fields[i].type->count_attribute_slots(false);
}
} else {
if (layout && layout->flags.q.explicit_location) {
fields[i].location = expl_location;
expl_location = expl_location + 1;
expl_location += fields[i].type->count_attribute_slots(false);
} else {
fields[i].location = -1;
}
@ -6484,7 +6485,7 @@ ast_struct_specifier::hir(exec_list *instructions,
state->struct_specifier_depth++;
unsigned expl_location = -1;
unsigned expl_location = 0;
if (layout && layout->flags.q.explicit_location) {
if (!process_qualifier_constant(state, &loc, "location",
layout->location, &expl_location)) {
@ -6671,7 +6672,7 @@ ast_interface_block::hir(exec_list *instructions,
return NULL;
}
unsigned expl_location = -1;
unsigned expl_location = 0;
if (layout.flags.q.explicit_location) {
if (!process_qualifier_constant(state, &loc, "location",
layout.location, &expl_location)) {