From 61de825e11e946b7fabb09fae60043539148108c Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Fri, 26 Apr 2019 13:21:56 -0700 Subject: [PATCH] spirv: Like Uniform, do nothing for UniformId Reviewed-by: Jason Ekstrand --- src/compiler/spirv/spirv_to_nir.c | 2 ++ src/compiler/spirv/vtn_variables.c | 1 + 2 files changed, 3 insertions(+) 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 */ -- 2.30.2