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

spirv: Fix structure splitting with per-vertex interface arrays.

Browse Source 
We want to use interface_type, not vtn_var->type.  They're normally
equivalent, but for geometry/tessellation per-vertex interface arrays,
we need to unwrap a level.

Otherwise, we tried to iterate a structure members but instead used
an array length.  If the array length was longer than the number of
fields in the structure, we'd crash.

Fixes the CreatePipelineGeometryInputBlockPositive layer validation
test.

v2: Just use glsl_without_array() on the vtn_var type
    (requested by Jason Ekstrand).

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Chris Forbes <chrisforbes@google.com>
This commit is contained in:
Kenneth Graunke
2016-03-13 00:08:56 -08:00
parent 1896682d27
commit 742bc53d04
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/spirv/vtn_variables.c
View File

@@ -929,7 +929,8 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
vtn_var->var->data.explicit_location = true; vtn_var->var->data.explicit_location = true;
} else { } else {
assert(vtn_var->members); assert(vtn_var->members);
unsigned length = glsl_get_length(vtn_var->type->type); unsigned length =
glsl_get_length(glsl_without_array(vtn_var->type->type));
for (unsigned i = 0; i < length; i++) { for (unsigned i = 0; i < length; i++) {
vtn_var->members[i]->data.location = location; vtn_var->members[i]->data.location = location;
vtn_var->members[i]->data.explicit_location = true; vtn_var->members[i]->data.explicit_location = true;