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

nir/spirv: Fix group decorations

Browse source 
They were completely bogus before.  For one thing, OpDecorationGroup
created a value of type undef rather than decoration_group.  Also
OpGroupMemberDecorate didn't properly apply the decoration to the different
members of the different groups.  It *should* be correct now but there's no
good way to test it yet.
This commit is contained in:
Jason Ekstrand 2016-01-02 11:51:40 -08:00
parent 6b0b57225c
commit f6c4658cde
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/glsl/nir/spirv/spirv_to_nir.c
View file

@ -298,7 +298,7 @@ vtn_handle_decoration(struct vtn_builder *b, SpvOp opcode,
switch (opcode) {
case SpvOpDecorationGroup:
vtn_push_value(b, target, vtn_value_type_undef);
vtn_push_value(b, target, vtn_value_type_decoration_group);
break;
case SpvOpDecorate:
@ -331,21 +331,19 @@ vtn_handle_decoration(struct vtn_builder *b, SpvOp opcode,
case SpvOpGroupMemberDecorate:
case SpvOpGroupDecorate: {
struct vtn_value *group = &b->values[target];
assert(group->value_type == vtn_value_type_decoration_group);
int scope;
if (opcode == SpvOpGroupDecorate) {
scope = VTN_DEC_DECORATION;
} else {
scope = VTN_DEC_STRUCT_MEMBER0 + *(w++);
}
struct vtn_value *group =
vtn_value(b, target, vtn_value_type_decoration_group);
for (; w < w_end; w++) {
struct vtn_value *val = &b->values[*w];
struct vtn_value *val = vtn_untyped_value(b, *w);
struct vtn_decoration *dec = rzalloc(b, struct vtn_decoration);
dec->scope = scope;
dec->group = group;
if (opcode == SpvOpGroupDecorate) {
dec->scope = VTN_DEC_DECORATION;
} else {
dec->scope = VTN_DEC_STRUCT_MEMBER0 + *(w++);
}
/* Link into the list */
dec->next = val->decoration;