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

glsl/linker: use without_array() to retrieve type

Browse Source 
This is what we do in the condition too, so it makes sense.

v2: Only compute without_array() once (Ilia).

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Iago Toral Quiroga
2017-11-03 10:46:30 +01:00
parent bec716e844
commit 456e10944f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -566,9 +566,10 @@ validate_explicit_variable_location(struct gl_context *ctx,
return false; return false;
} }
if (type->without_array()->is_interface()) { const glsl_type *type_without_array = type->without_array();
for (unsigned i = 0; i < type->without_array()->length; i++) { if (type_without_array->is_interface()) {
glsl_struct_field *field = &type->fields.structure[i]; for (unsigned i = 0; i < type_without_array->length; i++) {
glsl_struct_field *field = &type_without_array->fields.structure[i];
unsigned field_location = field->location - unsigned field_location = field->location -
(field->patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0); (field->patch ? VARYING_SLOT_PATCH0 : VARYING_SLOT_VAR0);
if (!check_location_aliasing(explicit_locations, var, if (!check_location_aliasing(explicit_locations, var,