AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/spirv: Rework decoration iteration

Browse Source 
The old code didn't work correctly if you had member decorations after
non-member decorations.  Since glslang never gave us any of those, it
wasn't properly tested.
This commit is contained in:
Jason Ekstrand
2015-11-20 15:15:38 -08:00
parent cff74d6fb8
commit 1157b0360d
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/glsl/nir/spirv_to_nir.c
+9 -8
View File
@@ -186,24 +186,25 @@ vtn_handle_extension(struct vtn_builder *b, SpvOp opcode,
static void
_foreach_decoration_helper(struct vtn_builder *b,
struct vtn_value *base_value,
int member,
int parent_member,
struct vtn_value *value,
vtn_decoration_foreach_cb cb, void *data)
{
int new_member = member;
for (struct vtn_decoration *dec = value->decoration; dec; dec = dec->next) {
if (dec->member >= 0) {
assert(member == -1);
new_member = dec->member;
int member;
if (dec->member < 0) {
member = parent_member;
} else {
assert(parent_member == -1);
member = dec->member;
}
if (dec->group) {
assert(dec->group->value_type == vtn_value_type_decoration_group);
_foreach_decoration_helper(b, base_value, new_member, dec->group,
_foreach_decoration_helper(b, base_value, member, dec->group,
cb, data);
} else {
cb(b, base_value, new_member, dec, data);
cb(b, base_value, member, dec, data);
}
}
}