OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: fix slot_end calculations and simplify reserved_slots check

Browse Source 
The previous code was confused about whether slot_end was inclusive or
exclusive. Make it so that it is inclusive consistently, and use it for
setting the new location. This also avoids discrepancies in how
num_components is calculated vs the more manual approach taken for the
former reserved_slots check.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
This commit is contained in:
Ilia Mirkin
2016-11-04 21:01:18 -04:00
parent 828faaef40
commit 885c788017
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/compiler/glsl/link_varyings.cpp
View File

@@ -1546,14 +1546,16 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
previous_var_xfb_only = var->data.is_xfb_only; previous_var_xfb_only = var->data.is_xfb_only;
unsigned num_elements = type->count_attribute_slots(is_vertex_input); /* The number of components taken up by this variable. For vertex shader
unsigned slot_end; * inputs, we use the number of slots * 4, as they have different
if (this->disable_varying_packing && * counting rules.
!is_varying_packing_safe(type, var)) */
slot_end = 4; unsigned num_components = is_vertex_input ?
else type->count_attribute_slots(is_vertex_input) * 4 :
slot_end = type->without_array()->vector_elements; this->matches[i].num_components;
slot_end += *location - 1;
/* The last slot for this variable, inclusive. */
unsigned slot_end = *location + num_components - 1;
/* FIXME: We could be smarter in the below code and loop back over /* FIXME: We could be smarter in the below code and loop back over
* trying to fill any locations that we skipped because we couldn't pack * trying to fill any locations that we skipped because we couldn't pack
@@ -1561,29 +1563,21 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
* hit the linking error if we run out of room and suggest they use * hit the linking error if we run out of room and suggest they use
* explicit locations. * explicit locations.
*/ */
for (unsigned j = 0; j < num_elements; j++) { while (slot_end < MAX_VARYING * 4u) {
while ((slot_end < MAX_VARYING * 4u) && const unsigned slots = (slot_end / 4u) - (*location / 4u) + 1;
((reserved_slots & (UINT64_C(1) << *location / 4u) || const uint64_t slot_mask = ((1ull << slots) - 1) << (*location / 4u);
(reserved_slots & (UINT64_C(1) << slot_end / 4u))))) {
assert(slots > 0);
if (reserved_slots & slot_mask) {
*location = ALIGN(*location + 1, 4); *location = ALIGN(*location + 1, 4);
slot_end = *location; slot_end = *location + num_components - 1;
continue;
/* reset the counter and try again */
j = 0;
} }
/* Increase the slot to make sure there is enough room for next break;
* array element.
*/
if (this->disable_varying_packing &&
!is_varying_packing_safe(type, var))
slot_end += 4;
else
slot_end += type->without_array()->vector_elements;
} }
if (!var->data.patch && *location >= MAX_VARYING * 4u) { if (!var->data.patch && slot_end >= MAX_VARYING * 4u) {
linker_error(prog, "insufficient contiguous locations available for " linker_error(prog, "insufficient contiguous locations available for "
"%s it is possible an array or struct could not be " "%s it is possible an array or struct could not be "
"packed between varyings with explicit locations. Try " "packed between varyings with explicit locations. Try "
@@ -1593,7 +1587,7 @@ varying_matches::assign_locations(struct gl_shader_program *prog,
this->matches[i].generic_location = *location; this->matches[i].generic_location = *location;
*location += this->matches[i].num_components; *location = slot_end + 1;
} }
return (generic_location + 3) / 4; return (generic_location + 3) / 4;