summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaio Marcelo de Oliveira Filho <[email protected]>2019-04-26 13:21:56 -0700
committerCaio Marcelo de Oliveira Filho <[email protected]>2019-06-03 17:20:54 -0700
commit61de825e11e946b7fabb09fae60043539148108c (patch)
tree7f245018b15a0fd0f2877f9f84dda1fac1013094
parentb4eff831803b0cb9500ae5607fe7620533b28a3e (diff)
spirv: Like Uniform, do nothing for UniformId
Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/compiler/spirv/spirv_to_nir.c2
-rw-r--r--src/compiler/spirv/vtn_variables.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 5aac1374710..613a4e876a8 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -751,6 +751,7 @@ struct_member_decoration_cb(struct vtn_builder *b,
switch (dec->decoration) {
case SpvDecorationRelaxedPrecision:
case SpvDecorationUniform:
+ case SpvDecorationUniformId:
break; /* FIXME: Do nothing with this for now. */
case SpvDecorationNonWritable:
vtn_handle_access_qualifier(b, ctx->type, member, ACCESS_NON_WRITEABLE);
@@ -980,6 +981,7 @@ type_decoration_cb(struct vtn_builder *b,
case SpvDecorationNonWritable:
case SpvDecorationNonReadable:
case SpvDecorationUniform:
+ case SpvDecorationUniformId:
case SpvDecorationLocation:
case SpvDecorationComponent:
case SpvDecorationOffset:
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index ee76230768c..925d2549d4c 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1501,6 +1501,7 @@ apply_var_decoration(struct vtn_builder *b,
case SpvDecorationMatrixStride:
case SpvDecorationAliased:
case SpvDecorationUniform:
+ case SpvDecorationUniformId:
case SpvDecorationLinkageAttributes:
break; /* Do nothing with these here */