SPV: Certain decorations are missing for structure-typed in/out variables.
diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index ceea1e2..7f12090 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -4024,7 +4024,7 @@
id = createSpvVariable(symbol);
symbolValues[symbol->getId()] = id;
- if (! symbol->getType().isStruct()) {
+ if (symbol->getBasicType() != glslang::EbtBlock) {
addDecoration(id, TranslatePrecisionDecoration(symbol->getType()));
addDecoration(id, TranslateInterpolationDecoration(symbol->getType().getQualifier()));
addDecoration(id, TranslateAuxiliaryStorageDecoration(symbol->getType().getQualifier()));
diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out
index 07dc1a7..5274913 100755
--- a/Test/baseResults/spv.430.vert.out
+++ b/Test/baseResults/spv.430.vert.out
@@ -63,6 +63,7 @@
Decorate 55(sampb2) Binding 5
Decorate 56(sampb4) DescriptorSet 0
Decorate 56(sampb4) Binding 31
+ Decorate 62(var) Flat
Decorate 62(var) Location 0
MemberDecorate 63(MS) 0 Location 17
Decorate 63(MS) Block
diff --git a/Test/baseResults/spv.layoutNested.vert.out b/Test/baseResults/spv.layoutNested.vert.out
index 2d6f559..d778fbb 100644
--- a/Test/baseResults/spv.layoutNested.vert.out
+++ b/Test/baseResults/spv.layoutNested.vert.out
@@ -162,6 +162,7 @@
Decorate 58(bBt3) BufferBlock
Decorate 60(bBtn3) DescriptorSet 1
Decorate 60(bBtn3) Binding 0
+ Decorate 62(sout) Flat
MemberDecorate 63(S) 0 Invariant
MemberDecorate 63(S) 1 Invariant
MemberDecorate 63(S) 2 Invariant
diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out
index 2d464de..21c389a 100755
--- a/Test/baseResults/spv.localAggregates.frag.out
+++ b/Test/baseResults/spv.localAggregates.frag.out
@@ -44,8 +44,11 @@
Name 128 "samp2D"
Name 134 "foo"
Name 135 "foo2"
+ Decorate 15(foo3) Flat
Decorate 90(condition) Flat
Decorate 128(samp2D) DescriptorSet 0
+ Decorate 134(foo) Flat
+ Decorate 135(foo2) Flat
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out
index b84b5ba..1f8ee96 100755
--- a/Test/baseResults/spv.variableArrayIndex.frag.out
+++ b/Test/baseResults/spv.variableArrayIndex.frag.out
@@ -39,6 +39,9 @@
Name 63 "coord"
Name 69 "constructed"
Decorate 10(Count) Flat
+ Decorate 20(foo3) Flat
+ Decorate 34(foo2) Flat
+ Decorate 36(foo) Flat
Decorate 59(samp2D) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2