diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index d5c03704..738c9169 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
@@ -1979,7 +1979,7 @@ void Builder::addDecoration(Id id, Decoration decoration, int num)
     if (num >= 0)
         dec->addImmediateOperand(num);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const char* s)
@@ -1993,7 +1993,7 @@ void Builder::addDecoration(Id id, Decoration decoration, const char* s)
     dec->addImmediateOperand(decoration);
     dec->addStringOperand(s);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const std::vector<unsigned>& literals)
@@ -2008,7 +2008,7 @@ void Builder::addDecoration(Id id, Decoration decoration, const std::vector<unsi
     for (auto literal : literals)
         dec->addImmediateOperand(literal);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecoration(Id id, Decoration decoration, const std::vector<const char*>& strings)
@@ -2023,7 +2023,7 @@ void Builder::addDecoration(Id id, Decoration decoration, const std::vector<cons
     for (auto string : strings)
         dec->addStringOperand(string);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addLinkageDecoration(Id id, const char* name, spv::LinkageType linkType) {
@@ -2034,7 +2034,7 @@ void Builder::addLinkageDecoration(Id id, const char* name, spv::LinkageType lin
     dec->addStringOperand(name);
     dec->addImmediateOperand(linkType);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecorationId(Id id, Decoration decoration, Id idDecoration)
@@ -2048,7 +2048,7 @@ void Builder::addDecorationId(Id id, Decoration decoration, Id idDecoration)
     dec->addImmediateOperand(decoration);
     dec->addIdOperand(idDecoration);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addDecorationId(Id id, Decoration decoration, const std::vector<Id>& operandIds)
@@ -2064,7 +2064,7 @@ void Builder::addDecorationId(Id id, Decoration decoration, const std::vector<Id
     for (auto operandId : operandIds)
         dec->addIdOperand(operandId);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, int num)
@@ -2080,7 +2080,7 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     if (num >= 0)
         dec->addImmediateOperand(num);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const char *s)
@@ -2095,7 +2095,7 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     dec->addImmediateOperand(decoration);
     dec->addStringOperand(s);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const std::vector<unsigned>& literals)
@@ -2111,7 +2111,7 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     for (auto literal : literals)
         dec->addImmediateOperand(literal);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decoration, const std::vector<const char*>& strings)
@@ -2127,7 +2127,7 @@ void Builder::addMemberDecoration(Id id, unsigned int member, Decoration decorat
     for (auto string : strings)
         dec->addStringOperand(string);
 
-    decorations.push_back(std::unique_ptr<Instruction>(dec));
+    decorations.insert(std::unique_ptr<Instruction>(dec));
 }
 
 void Builder::addInstruction(std::unique_ptr<Instruction> inst) {
@@ -4330,11 +4330,10 @@ void Builder::dumpSourceInstructions(std::vector<unsigned int>& out) const
         dumpSourceInstructions(iItr->first, *iItr->second, out);
 }
 
-void Builder::dumpInstructions(std::vector<unsigned int>& out,
-    const std::vector<std::unique_ptr<Instruction> >& instructions) const
+template <class Range> void Builder::dumpInstructions(std::vector<unsigned int>& out, const Range& instructions) const
 {
-    for (int i = 0; i < (int)instructions.size(); ++i) {
-        instructions[i]->dump(out);
+    for (const auto& inst : instructions) {
+        inst->dump(out);
     }
 }
 
@@ -4347,4 +4346,40 @@ void Builder::dumpModuleProcesses(std::vector<unsigned int>& out) const
     }
 }
 
+bool Builder::DecorationInstructionLessThan::operator()(const std::unique_ptr<Instruction>& lhs,
+                                                        const std::unique_ptr<Instruction>& rhs) const
+{
+    // Order by the id to which the decoration applies first. This is more intuitive.
+    assert(lhs->isIdOperand(0) && rhs->isIdOperand(0));
+    if (lhs->getIdOperand(0) != rhs->getIdOperand(0)) {
+        return lhs->getIdOperand(0) < rhs->getIdOperand(0);
+    }
+
+    if (lhs->getOpCode() != rhs->getOpCode())
+        return lhs->getOpCode() < rhs->getOpCode();
+
+    // Now compare the operands.
+    int minSize = std::min(lhs->getNumOperands(), rhs->getNumOperands());
+    for (int i = 1; i < minSize; ++i) {
+        if (lhs->isIdOperand(i) != rhs->isIdOperand(i)) {
+            return lhs->isIdOperand(i) < rhs->isIdOperand(i);
+        }
+
+        if (lhs->isIdOperand(i)) {
+            if (lhs->getIdOperand(i) != rhs->getIdOperand(i)) {
+                return lhs->getIdOperand(i) < rhs->getIdOperand(i);
+            }
+        } else {
+            if (lhs->getImmediateOperand(i) != rhs->getImmediateOperand(i)) {
+                return lhs->getImmediateOperand(i) < rhs->getImmediateOperand(i);
+            }
+        }
+    }
+
+    if (lhs->getNumOperands() != rhs->getNumOperands())
+        return lhs->getNumOperands() < rhs->getNumOperands();
+
+    // In this case they are equal.
+    return false;
+}
 } // end spv namespace
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index 08057f43..ab4d5abe 100644
--- a/SPIRV/SpvBuilder.h
+++ b/SPIRV/SpvBuilder.h
@@ -890,10 +890,13 @@ public:
     void createSelectionMerge(Block* mergeBlock, unsigned int control);
     void dumpSourceInstructions(std::vector<unsigned int>&) const;
     void dumpSourceInstructions(const spv::Id fileId, const std::string& text, std::vector<unsigned int>&) const;
-    void dumpInstructions(std::vector<unsigned int>&, const std::vector<std::unique_ptr<Instruction> >&) const;
+    template <class Range> void dumpInstructions(std::vector<unsigned int>& out, const Range& instructions) const;
     void dumpModuleProcesses(std::vector<unsigned int>&) const;
     spv::MemoryAccessMask sanitizeMemoryAccessForStorageClass(spv::MemoryAccessMask memoryAccess, StorageClass sc)
         const;
+    struct DecorationInstructionLessThan {
+        bool operator()(const std::unique_ptr<Instruction>& lhs, const std::unique_ptr<Instruction>& rhs) const;
+    };
 
     unsigned int spvVersion;     // the version of SPIR-V to emit in the header
     SourceLanguage sourceLang;
@@ -950,7 +953,7 @@ public:
     std::vector<std::unique_ptr<Instruction> > entryPoints;
     std::vector<std::unique_ptr<Instruction> > executionModes;
     std::vector<std::unique_ptr<Instruction> > names;
-    std::vector<std::unique_ptr<Instruction> > decorations;
+    std::set<std::unique_ptr<Instruction>, DecorationInstructionLessThan> decorations;
     std::vector<std::unique_ptr<Instruction> > constantsTypesGlobals;
     std::vector<std::unique_ptr<Instruction> > externals;
     std::vector<std::unique_ptr<Function> > functions;
diff --git a/SPIRV/SpvPostProcess.cpp b/SPIRV/SpvPostProcess.cpp
index 5b3fbb56..e35ab71f 100644
--- a/SPIRV/SpvPostProcess.cpp
+++ b/SPIRV/SpvPostProcess.cpp
@@ -387,12 +387,14 @@ void Builder::postProcessCFG()
     }
 
     // Remove unneeded decorations, for unreachable instructions
-    decorations.erase(std::remove_if(decorations.begin(), decorations.end(),
-        [&unreachableDefinitions](std::unique_ptr<Instruction>& I) -> bool {
-            Id decoration_id = I.get()->getIdOperand(0);
-            return unreachableDefinitions.count(decoration_id) != 0;
-        }),
-        decorations.end());
+    for (auto decorationIter = decorations.begin(); decorationIter != decorations.end();) {
+        Id decorationId = (*decorationIter)->getIdOperand(0);
+        if (unreachableDefinitions.count(decorationId) != 0) {
+            decorationIter = decorations.erase(decorationIter);
+        } else {
+            ++decorationIter;
+        }
+    }
 }
 
 // comment in header
diff --git a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
index 100f6d71..1e6521e6 100644
--- a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
@@ -13,10 +13,10 @@ hlsl.aliasOpaque.frag
                               Name 47  "gss"
                               Name 51  "gtex"
                               Name 62  "@entryPointOutput"
-                              Decorate 47(gss) DescriptorSet 0
                               Decorate 47(gss) Binding 0
-                              Decorate 51(gtex) DescriptorSet 0
+                              Decorate 47(gss) DescriptorSet 0
                               Decorate 51(gtex) Binding 2
+                              Decorate 51(gtex) DescriptorSet 0
                               Decorate 62(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
index be1637ff..3a839db9 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
@@ -15,14 +15,14 @@ hlsl.flattenOpaque.frag
                               Name 97  "s2.s2D"
                               Name 100  "s2.tex"
                               Name 120  "@entryPointOutput"
-                              Decorate 38(tex) DescriptorSet 0
                               Decorate 38(tex) Binding 0
-                              Decorate 82(s.s2D) DescriptorSet 0
+                              Decorate 38(tex) DescriptorSet 0
                               Decorate 82(s.s2D) Binding 1
-                              Decorate 97(s2.s2D) DescriptorSet 0
+                              Decorate 82(s.s2D) DescriptorSet 0
                               Decorate 97(s2.s2D) Binding 2
-                              Decorate 100(s2.tex) DescriptorSet 0
+                              Decorate 97(s2.s2D) DescriptorSet 0
                               Decorate 100(s2.tex) Binding 3
+                              Decorate 100(s2.tex) DescriptorSet 0
                               Decorate 120(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
index 18d76949..5aa5fdc2 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
@@ -12,10 +12,10 @@ hlsl.flattenOpaqueInit.vert
                               Name 43  "g_tInputTexture_sampler"
                               Name 47  "g_tInputTexture"
                               Name 80  "@entryPointOutput"
-                              Decorate 43(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 43(g_tInputTexture_sampler) Binding 0
-                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 43(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 47(g_tInputTexture) Binding 1
+                              Decorate 47(g_tInputTexture) DescriptorSet 0
                               Decorate 80(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
index 914d9b5d..60e71516 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
@@ -12,10 +12,10 @@ hlsl.flattenOpaqueInitMix.vert
                               Name 44  "g_tInputTexture_sampler"
                               Name 47  "g_tInputTexture"
                               Name 57  "@entryPointOutput"
-                              Decorate 44(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 44(g_tInputTexture_sampler) Binding 0
-                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 44(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 47(g_tInputTexture) Binding 1
+                              Decorate 47(g_tInputTexture) DescriptorSet 0
                               Decorate 57(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseLegalResults/hlsl.flattenSubset.frag.out b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
index 2be41f04..92c62cf0 100644
--- a/Test/baseLegalResults/hlsl.flattenSubset.frag.out
+++ b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
@@ -13,10 +13,10 @@ hlsl.flattenSubset.frag
                               Name 21  "samp"
                               Name 33  "tex"
                               Name 50  "@entryPointOutput"
-                              Decorate 21(samp) DescriptorSet 0
                               Decorate 21(samp) Binding 0
-                              Decorate 33(tex) DescriptorSet 0
+                              Decorate 21(samp) DescriptorSet 0
                               Decorate 33(tex) Binding 1
+                              Decorate 33(tex) DescriptorSet 0
                               Decorate 50(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/glsl.autosampledtextures.frag.out b/Test/baseResults/glsl.autosampledtextures.frag.out
index cbbb2021..522cc4ad 100644
--- a/Test/baseResults/glsl.autosampledtextures.frag.out
+++ b/Test/baseResults/glsl.autosampledtextures.frag.out
@@ -14,8 +14,8 @@ glsl.autosampledtextures.frag
                               Name 13  "u_Tex"
                               Name 17  "in_UV"
                               Name 21  "out_Color"
-                              Decorate 13(u_Tex) DescriptorSet 0
                               Decorate 13(u_Tex) Binding 0
+                              Decorate 13(u_Tex) DescriptorSet 0
                               Decorate 17(in_UV) Location 0
                               Decorate 21(out_Color) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/glsl.entryPointRename.vert.bad.out b/Test/baseResults/glsl.entryPointRename.vert.bad.out
index ae5de6e3..d46ef59a 100644
--- a/Test/baseResults/glsl.entryPointRename.vert.bad.out
+++ b/Test/baseResults/glsl.entryPointRename.vert.bad.out
@@ -17,11 +17,11 @@ ERROR: Source entry point must be "main"
                               MemberName 11(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 11(gl_PerVertex) 3  "gl_CullDistance"
                               Name 13  ""
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/glsl.entryPointRename.vert.out b/Test/baseResults/glsl.entryPointRename.vert.out
index bc142a58..87ddf2a0 100644
--- a/Test/baseResults/glsl.entryPointRename.vert.out
+++ b/Test/baseResults/glsl.entryPointRename.vert.out
@@ -15,11 +15,11 @@ glsl.entryPointRename.vert
                               MemberName 11(gl_PerVertex) 2  "gl_ClipDistance"
                               MemberName 11(gl_PerVertex) 3  "gl_CullDistance"
                               Name 13  ""
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.aliasOpaque.frag.out b/Test/baseResults/hlsl.aliasOpaque.frag.out
index 7bea6917..af6d18ba 100644
--- a/Test/baseResults/hlsl.aliasOpaque.frag.out
+++ b/Test/baseResults/hlsl.aliasOpaque.frag.out
@@ -166,12 +166,12 @@ gl_FragCoord origin is upper left
                               Name 51  "gtex"
                               Name 56  "param"
                               Name 62  "@entryPointOutput"
-                              Decorate 44(gss2) DescriptorSet 0
                               Decorate 44(gss2) Binding 1
-                              Decorate 47(gss) DescriptorSet 0
+                              Decorate 44(gss2) DescriptorSet 0
                               Decorate 47(gss) Binding 0
-                              Decorate 51(gtex) DescriptorSet 0
+                              Decorate 47(gss) DescriptorSet 0
                               Decorate 51(gtex) Binding 2
+                              Decorate 51(gtex) DescriptorSet 0
                               Decorate 62(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.amend.frag.out b/Test/baseResults/hlsl.amend.frag.out
index b8ac133c..89b0c948 100644
--- a/Test/baseResults/hlsl.amend.frag.out
+++ b/Test/baseResults/hlsl.amend.frag.out
@@ -182,14 +182,14 @@ gl_FragCoord origin is upper left
                               MemberName 20($Global) 3  "d"
                               MemberName 20($Global) 4  "e"
                               Name 22  ""
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 16
                               MemberDecorate 20($Global) 2 Offset 32
                               MemberDecorate 20($Global) 3 Offset 44
                               MemberDecorate 20($Global) 4 Offset 48
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 0
+                              Decorate 22 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
               14:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.array.flatten.frag.out b/Test/baseResults/hlsl.array.flatten.frag.out
index 264a716c..e225f196 100644
--- a/Test/baseResults/hlsl.array.flatten.frag.out
+++ b/Test/baseResults/hlsl.array.flatten.frag.out
@@ -392,44 +392,44 @@ gl_FragCoord origin is upper left
                               Name 140  "g_samp_explicit[0]"
                               Name 141  "g_samp_explicit[1]"
                               Name 142  "g_samp_explicit[2]"
-                              Decorate 42(g_tex[1]) DescriptorSet 0
                               Decorate 42(g_tex[1]) Binding 4
-                              Decorate 45(g_samp[1]) DescriptorSet 0
+                              Decorate 42(g_tex[1]) DescriptorSet 0
                               Decorate 45(g_samp[1]) Binding 10
-                              Decorate 65(g_samp[0]) DescriptorSet 0
+                              Decorate 45(g_samp[1]) DescriptorSet 0
                               Decorate 65(g_samp[0]) Binding 9
-                              Decorate 70(g_samp[2]) DescriptorSet 0
+                              Decorate 65(g_samp[0]) DescriptorSet 0
                               Decorate 70(g_samp[2]) Binding 11
-                              Decorate 74(g_tex[0]) DescriptorSet 0
+                              Decorate 70(g_samp[2]) DescriptorSet 0
                               Decorate 74(g_tex[0]) Binding 0
-                              Decorate 79(g_tex[2]) DescriptorSet 0
+                              Decorate 74(g_tex[0]) DescriptorSet 0
                               Decorate 79(g_tex[2]) Binding 8
+                              Decorate 79(g_tex[2]) DescriptorSet 0
                               Decorate 88 ArrayStride 48
                               Decorate 89 ArrayStride 48
                               Decorate 90 ArrayStride 16
-                              MemberDecorate 91($Global) 0 RowMajor
-                              MemberDecorate 91($Global) 0 Offset 0
-                              MemberDecorate 91($Global) 0 MatrixStride 16
-                              MemberDecorate 91($Global) 1 RowMajor
-                              MemberDecorate 91($Global) 1 Offset 192
-                              MemberDecorate 91($Global) 1 MatrixStride 16
-                              MemberDecorate 91($Global) 2 Offset 384
                               Decorate 91($Global) Block
-                              Decorate 93 DescriptorSet 0
+                              MemberDecorate 91($Global) 0 RowMajor
+                              MemberDecorate 91($Global) 0 MatrixStride 16
+                              MemberDecorate 91($Global) 0 Offset 0
+                              MemberDecorate 91($Global) 1 RowMajor
+                              MemberDecorate 91($Global) 1 MatrixStride 16
+                              MemberDecorate 91($Global) 1 Offset 192
+                              MemberDecorate 91($Global) 2 Offset 384
                               Decorate 93 Binding 12
+                              Decorate 93 DescriptorSet 0
                               Decorate 134(ps_output.color) Location 0
-                              Decorate 137(g_tex_explicit[0]) DescriptorSet 0
                               Decorate 137(g_tex_explicit[0]) Binding 1
-                              Decorate 138(g_tex_explicit[1]) DescriptorSet 0
+                              Decorate 137(g_tex_explicit[0]) DescriptorSet 0
                               Decorate 138(g_tex_explicit[1]) Binding 2
-                              Decorate 139(g_tex_explicit[2]) DescriptorSet 0
+                              Decorate 138(g_tex_explicit[1]) DescriptorSet 0
                               Decorate 139(g_tex_explicit[2]) Binding 3
-                              Decorate 140(g_samp_explicit[0]) DescriptorSet 0
+                              Decorate 139(g_tex_explicit[2]) DescriptorSet 0
                               Decorate 140(g_samp_explicit[0]) Binding 5
-                              Decorate 141(g_samp_explicit[1]) DescriptorSet 0
+                              Decorate 140(g_samp_explicit[0]) DescriptorSet 0
                               Decorate 141(g_samp_explicit[1]) Binding 6
-                              Decorate 142(g_samp_explicit[2]) DescriptorSet 0
+                              Decorate 141(g_samp_explicit[1]) DescriptorSet 0
                               Decorate 142(g_samp_explicit[2]) Binding 7
+                              Decorate 142(g_samp_explicit[2]) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out
index 6a13326a..45307eac 100644
--- a/Test/baseResults/hlsl.array.frag.out
+++ b/Test/baseResults/hlsl.array.frag.out
@@ -328,13 +328,13 @@ gl_FragCoord origin is upper left
                               Decorate 47 ArrayStride 112
                               Decorate 49 ArrayStride 16
                               Decorate 50 ArrayStride 16
+                              Decorate 51($Global) Block
                               MemberDecorate 51($Global) 0 Offset 0
                               MemberDecorate 51($Global) 1 Offset 64
                               MemberDecorate 51($Global) 2 Offset 1296
                               MemberDecorate 51($Global) 3 Offset 1312
-                              Decorate 51($Global) Block
-                              Decorate 53 DescriptorSet 0
                               Decorate 53 Binding 0
+                              Decorate 53 DescriptorSet 0
                               Decorate 103(i) Flat
                               Decorate 103(i) Location 0
                               Decorate 107(input) Location 1
diff --git a/Test/baseResults/hlsl.array.multidim.frag.out b/Test/baseResults/hlsl.array.multidim.frag.out
index 7b9d9621..50cfeb21 100644
--- a/Test/baseResults/hlsl.array.multidim.frag.out
+++ b/Test/baseResults/hlsl.array.multidim.frag.out
@@ -157,10 +157,10 @@ gl_FragCoord origin is upper left
                               Decorate 22 ArrayStride 16
                               Decorate 24 ArrayStride 48
                               Decorate 26 ArrayStride 192
-                              MemberDecorate 27($Global) 0 Offset 0
                               Decorate 27($Global) Block
-                              Decorate 29 DescriptorSet 0
+                              MemberDecorate 27($Global) 0 Offset 0
                               Decorate 29 Binding 0
+                              Decorate 29 DescriptorSet 0
                               Decorate 54(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out
index ee183c8d..910ccfdb 100644
--- a/Test/baseResults/hlsl.attribute.expression.comp.out
+++ b/Test/baseResults/hlsl.attribute.expression.comp.out
@@ -79,10 +79,10 @@ local_size = (4, 6, 8)
                               Name 18  "$Global"
                               MemberName 18($Global) 0  "bound"
                               Name 20  ""
-                              MemberDecorate 18($Global) 0 Offset 0
                               Decorate 18($Global) Block
-                              Decorate 20 DescriptorSet 0
+                              MemberDecorate 18($Global) 0 Offset 0
                               Decorate 20 Binding 0
+                              Decorate 20 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.attributeC11.frag.out b/Test/baseResults/hlsl.attributeC11.frag.out
index c97c300a..8def5712 100644
--- a/Test/baseResults/hlsl.attributeC11.frag.out
+++ b/Test/baseResults/hlsl.attributeC11.frag.out
@@ -122,23 +122,23 @@ Validation failed
                               Name 48  "pcBuf"
                               MemberName 48(pcBuf) 0  "a"
                               Name 50  ""
-                              Decorate 16(attach) DescriptorSet 0
                               Decorate 16(attach) Binding 0
+                              Decorate 16(attach) DescriptorSet 0
                               Decorate 16(attach) InputAttachmentIndex 4
                               Decorate 33(input) Location 8
                               Decorate 36(@entryPointOutput) Location 7
                               MemberDecorate 41(S) 0 Offset 0
                               Decorate 42 ArrayStride 8
+                              Decorate 43(buffer1) BufferBlock
                               MemberDecorate 43(buffer1) 0 NonWritable
                               MemberDecorate 43(buffer1) 0 Offset 0
-                              Decorate 43(buffer1) BufferBlock
-                              Decorate 45(buffer1) DescriptorSet 0
                               Decorate 45(buffer1) Binding 1
-                              Decorate 46(buffer3) DescriptorSet 2
+                              Decorate 45(buffer1) DescriptorSet 0
                               Decorate 46(buffer3) Binding 3
+                              Decorate 46(buffer3) DescriptorSet 2
                               Decorate 47(ci) SpecId 13
-                              MemberDecorate 48(pcBuf) 0 Offset 0
                               Decorate 48(pcBuf) Block
+                              MemberDecorate 48(pcBuf) 0 Offset 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out b/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out
index 4726ddd0..ec3be437 100644
--- a/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out
+++ b/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out
@@ -72,11 +72,11 @@ gl_FragCoord origin is upper left
                               MemberName 11($Global) 1  "u2"
                               Name 13  ""
                               Name 26  "@entryPointOutput"
+                              Decorate 11($Global) Block
                               MemberDecorate 11($Global) 0 Offset 0
                               MemberDecorate 11($Global) 1 Offset 16
-                              Decorate 11($Global) Block
-                              Decorate 13 DescriptorSet 2
                               Decorate 13 Binding 5
+                              Decorate 13 DescriptorSet 2
                               Decorate 26(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.autosampledtextures.frag.out b/Test/baseResults/hlsl.autosampledtextures.frag.out
index 070af823..4a54526a 100644
--- a/Test/baseResults/hlsl.autosampledtextures.frag.out
+++ b/Test/baseResults/hlsl.autosampledtextures.frag.out
@@ -22,8 +22,8 @@ hlsl.autosampledtextures.frag
                               Name 36  "i.vTextureCoords"
                               Name 40  "@entryPointOutput.vColor"
                               Name 41  "param"
-                              Decorate 23(g_tColor) DescriptorSet 0
                               Decorate 23(g_tColor) Binding 0
+                              Decorate 23(g_tColor) DescriptorSet 0
                               Decorate 36(i.vTextureCoords) Location 0
                               Decorate 40(@entryPointOutput.vColor) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out
index f95b8398..64959d69 100644
--- a/Test/baseResults/hlsl.buffer.frag.out
+++ b/Test/baseResults/hlsl.buffer.frag.out
@@ -194,24 +194,25 @@ Validation failed
                               Name 65  "input"
                               Name 68  "@entryPointOutput.a"
                               Name 69  "param"
-                              MemberDecorate 24(cbufName2) 0 Offset 0
                               Decorate 24(cbufName2) Block
-                              Decorate 26 DescriptorSet 0
+                              MemberDecorate 24(cbufName2) 0 Offset 0
                               Decorate 26 Binding 3
-                              MemberDecorate 31(buf1) 0 Offset 0
+                              Decorate 26 DescriptorSet 0
                               Decorate 31(buf1) Block
-                              Decorate 33 DescriptorSet 0
+                              MemberDecorate 31(buf1) 0 Offset 0
                               Decorate 33 Binding 0
+                              Decorate 33 DescriptorSet 0
+                              Decorate 37(buf2) BufferBlock
                               MemberDecorate 37(buf2) 0 NonWritable
                               MemberDecorate 37(buf2) 0 Offset 0
-                              Decorate 37(buf2) BufferBlock
-                              Decorate 39 DescriptorSet 0
                               Decorate 39 Binding 1
+                              Decorate 39 DescriptorSet 0
+                              Decorate 43(cbufName) Block
                               MemberDecorate 43(cbufName) 0 Offset 0
                               MemberDecorate 43(cbufName) 1 Offset 20
-                              Decorate 43(cbufName) Block
-                              Decorate 45 DescriptorSet 0
                               Decorate 45 Binding 2
+                              Decorate 45 DescriptorSet 0
+                              Decorate 50(tbufName) BufferBlock
                               MemberDecorate 50(tbufName) 0 NonWritable
                               MemberDecorate 50(tbufName) 0 Offset 16
                               MemberDecorate 50(tbufName) 1 NonWritable
@@ -229,24 +230,23 @@ Validation failed
                               MemberDecorate 50(tbufName) 7 NonWritable
                               MemberDecorate 50(tbufName) 7 Offset 128
                               MemberDecorate 50(tbufName) 8 RowMajor
+                              MemberDecorate 50(tbufName) 8 MatrixStride 16
                               MemberDecorate 50(tbufName) 8 NonWritable
                               MemberDecorate 50(tbufName) 8 Offset 112
-                              MemberDecorate 50(tbufName) 8 MatrixStride 16
                               MemberDecorate 50(tbufName) 9 ColMajor
+                              MemberDecorate 50(tbufName) 9 MatrixStride 16
                               MemberDecorate 50(tbufName) 9 NonWritable
                               MemberDecorate 50(tbufName) 9 Offset 176
-                              MemberDecorate 50(tbufName) 9 MatrixStride 16
                               MemberDecorate 50(tbufName) 10 RowMajor
+                              MemberDecorate 50(tbufName) 10 MatrixStride 16
                               MemberDecorate 50(tbufName) 10 NonWritable
                               MemberDecorate 50(tbufName) 10 Offset 240
-                              MemberDecorate 50(tbufName) 10 MatrixStride 16
                               MemberDecorate 50(tbufName) 11 RowMajor
+                              MemberDecorate 50(tbufName) 11 MatrixStride 16
                               MemberDecorate 50(tbufName) 11 NonWritable
                               MemberDecorate 50(tbufName) 11 Offset 304
-                              MemberDecorate 50(tbufName) 11 MatrixStride 16
-                              Decorate 50(tbufName) BufferBlock
-                              Decorate 52 DescriptorSet 0
                               Decorate 52 Binding 8
+                              Decorate 52 DescriptorSet 0
                               Decorate 65(input) BuiltIn FragCoord
                               Decorate 68(@entryPointOutput.a) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.buffer_ref_parameter.comp.out b/Test/baseResults/hlsl.buffer_ref_parameter.comp.out
index 4ddf6f70..1f7f0906 100644
--- a/Test/baseResults/hlsl.buffer_ref_parameter.comp.out
+++ b/Test/baseResults/hlsl.buffer_ref_parameter.comp.out
@@ -275,17 +275,17 @@ local_size = (64, 1, 1)
                               Name 85  "gi"
                               Name 87  "param"
                               Decorate 7 ArrayStride 4
+                              Decorate 8 Block
                               MemberDecorate 8 0 NonWritable
                               MemberDecorate 8 0 Offset 0
-                              Decorate 8 Block
                               Decorate 14(buffer_position) NonWritable
-                              Decorate 53(buffer_position_ms) DescriptorSet 0
                               Decorate 53(buffer_position_ms) Binding 0
+                              Decorate 53(buffer_position_ms) DescriptorSet 0
                               Decorate 59 ArrayStride 4
-                              MemberDecorate 60(r) 0 Offset 0
                               Decorate 60(r) Block
-                              Decorate 62(r) DescriptorSet 0
+                              MemberDecorate 60(r) 0 Offset 0
                               Decorate 62(r) Binding 1
+                              Decorate 62(r) DescriptorSet 0
                               Decorate 85(gi) BuiltIn LocalInvocationIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out
index 7d896cea..14ed71e2 100644
--- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out
+++ b/Test/baseResults/hlsl.calculatelod.dx10.frag.out
@@ -400,30 +400,30 @@ using depth_any
                               Name 140  "@entryPointOutput.Color"
                               Name 144  "@entryPointOutput.Depth"
                               Name 147  "g_tTex1df4"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4a) Binding 2
-                              Decorate 45(g_tTex1du4a) DescriptorSet 0
+                              Decorate 33(g_tTex1di4a) DescriptorSet 0
                               Decorate 45(g_tTex1du4a) Binding 3
-                              Decorate 56(g_tTex2df4a) DescriptorSet 0
+                              Decorate 45(g_tTex1du4a) DescriptorSet 0
                               Decorate 56(g_tTex2df4a) Binding 4
-                              Decorate 67(g_tTex2di4a) DescriptorSet 0
+                              Decorate 56(g_tTex2df4a) DescriptorSet 0
                               Decorate 67(g_tTex2di4a) Binding 5
-                              Decorate 79(g_tTex2du4a) DescriptorSet 0
+                              Decorate 67(g_tTex2di4a) DescriptorSet 0
                               Decorate 79(g_tTex2du4a) Binding 6
-                              Decorate 92(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 79(g_tTex2du4a) DescriptorSet 0
                               Decorate 92(g_tTexcdf4a) Binding 7
-                              Decorate 104(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 92(g_tTexcdf4a) DescriptorSet 0
                               Decorate 104(g_tTexcdi4a) Binding 8
-                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 104(g_tTexcdi4a) DescriptorSet 0
                               Decorate 115(g_tTexcdu4a) Binding 9
+                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
                               Decorate 140(@entryPointOutput.Color) Location 0
                               Decorate 144(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 147(g_tTex1df4) DescriptorSet 0
                               Decorate 147(g_tTex1df4) Binding 0
+                              Decorate 147(g_tTex1df4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
index 3ce857d9..c052200a 100644
--- a/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
+++ b/Test/baseResults/hlsl.calculatelodunclamped.dx10.frag.out
@@ -400,30 +400,30 @@ using depth_any
                               Name 140  "@entryPointOutput.Color"
                               Name 144  "@entryPointOutput.Depth"
                               Name 147  "g_tTex1df4"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4a) Binding 2
-                              Decorate 45(g_tTex1du4a) DescriptorSet 0
+                              Decorate 33(g_tTex1di4a) DescriptorSet 0
                               Decorate 45(g_tTex1du4a) Binding 3
-                              Decorate 56(g_tTex2df4a) DescriptorSet 0
+                              Decorate 45(g_tTex1du4a) DescriptorSet 0
                               Decorate 56(g_tTex2df4a) Binding 4
-                              Decorate 67(g_tTex2di4a) DescriptorSet 0
+                              Decorate 56(g_tTex2df4a) DescriptorSet 0
                               Decorate 67(g_tTex2di4a) Binding 5
-                              Decorate 79(g_tTex2du4a) DescriptorSet 0
+                              Decorate 67(g_tTex2di4a) DescriptorSet 0
                               Decorate 79(g_tTex2du4a) Binding 6
-                              Decorate 92(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 79(g_tTex2du4a) DescriptorSet 0
                               Decorate 92(g_tTexcdf4a) Binding 7
-                              Decorate 104(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 92(g_tTexcdf4a) DescriptorSet 0
                               Decorate 104(g_tTexcdi4a) Binding 8
-                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 104(g_tTexcdi4a) DescriptorSet 0
                               Decorate 115(g_tTexcdu4a) Binding 9
+                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
                               Decorate 140(@entryPointOutput.Color) Location 0
                               Decorate 144(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 147(g_tTex1df4) DescriptorSet 0
                               Decorate 147(g_tTex1df4) Binding 0
+                              Decorate 147(g_tTex1df4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.cbuffer-identifier.vert.out b/Test/baseResults/hlsl.cbuffer-identifier.vert.out
index de9deea7..3fa3d5d2 100644
--- a/Test/baseResults/hlsl.cbuffer-identifier.vert.out
+++ b/Test/baseResults/hlsl.cbuffer-identifier.vert.out
@@ -281,18 +281,18 @@ Shader version: 500
                               Name 82  "param"
                               Name 86  "@entryPointOutput.Pos"
                               Name 90  "@entryPointOutput.Norm"
-                              MemberDecorate 28(C) 0 RowMajor
-                              MemberDecorate 28(C) 0 Offset 0
-                              MemberDecorate 28(C) 0 MatrixStride 16
-                              MemberDecorate 28(C) 1 RowMajor
-                              MemberDecorate 28(C) 1 Offset 64
-                              MemberDecorate 28(C) 1 MatrixStride 16
-                              MemberDecorate 28(C) 2 RowMajor
-                              MemberDecorate 28(C) 2 Offset 128
-                              MemberDecorate 28(C) 2 MatrixStride 16
                               Decorate 28(C) Block
-                              Decorate 30 DescriptorSet 0
+                              MemberDecorate 28(C) 0 RowMajor
+                              MemberDecorate 28(C) 0 MatrixStride 16
+                              MemberDecorate 28(C) 0 Offset 0
+                              MemberDecorate 28(C) 1 RowMajor
+                              MemberDecorate 28(C) 1 MatrixStride 16
+                              MemberDecorate 28(C) 1 Offset 64
+                              MemberDecorate 28(C) 2 RowMajor
+                              MemberDecorate 28(C) 2 MatrixStride 16
+                              MemberDecorate 28(C) 2 Offset 128
                               Decorate 30 Binding 0
+                              Decorate 30 DescriptorSet 0
                               Decorate 74(input.Pos) Location 0
                               Decorate 78(input.Norm) Location 1
                               Decorate 86(@entryPointOutput.Pos) BuiltIn Position
diff --git a/Test/baseResults/hlsl.cbuffer-offsets.comp.out b/Test/baseResults/hlsl.cbuffer-offsets.comp.out
index feb0bb69..793d5b91 100644
--- a/Test/baseResults/hlsl.cbuffer-offsets.comp.out
+++ b/Test/baseResults/hlsl.cbuffer-offsets.comp.out
@@ -70,63 +70,63 @@ Validation failed
                               Name 27  ""
                               Decorate 13 ArrayStride 16
                               Decorate 24 ArrayStride 16
+                              Decorate 25(CB) Block
                               MemberDecorate 25(CB) 0 Offset 0
                               MemberDecorate 25(CB) 1 Offset 16
                               MemberDecorate 25(CB) 2 Offset 60
                               MemberDecorate 25(CB) 3 Offset 64
                               MemberDecorate 25(CB) 4 RowMajor
-                              MemberDecorate 25(CB) 4 Offset 68
                               MemberDecorate 25(CB) 4 MatrixStride 16
+                              MemberDecorate 25(CB) 4 Offset 68
                               MemberDecorate 25(CB) 5 RowMajor
-                              MemberDecorate 25(CB) 5 Offset 80
                               MemberDecorate 25(CB) 5 MatrixStride 16
+                              MemberDecorate 25(CB) 5 Offset 80
                               MemberDecorate 25(CB) 6 RowMajor
-                              MemberDecorate 25(CB) 6 Offset 100
                               MemberDecorate 25(CB) 6 MatrixStride 16
+                              MemberDecorate 25(CB) 6 Offset 100
                               MemberDecorate 25(CB) 7 RowMajor
-                              MemberDecorate 25(CB) 7 Offset 112
                               MemberDecorate 25(CB) 7 MatrixStride 16
+                              MemberDecorate 25(CB) 7 Offset 112
                               MemberDecorate 25(CB) 8 RowMajor
-                              MemberDecorate 25(CB) 8 Offset 144
                               MemberDecorate 25(CB) 8 MatrixStride 16
+                              MemberDecorate 25(CB) 8 Offset 144
                               MemberDecorate 25(CB) 9 Offset 188
                               MemberDecorate 25(CB) 10 RowMajor
-                              MemberDecorate 25(CB) 10 Offset 192
                               MemberDecorate 25(CB) 10 MatrixStride 16
+                              MemberDecorate 25(CB) 10 Offset 192
                               MemberDecorate 25(CB) 11 Offset 252
                               MemberDecorate 25(CB) 12 RowMajor
-                              MemberDecorate 25(CB) 12 Offset 256
                               MemberDecorate 25(CB) 12 MatrixStride 16
+                              MemberDecorate 25(CB) 12 Offset 256
                               MemberDecorate 25(CB) 13 Offset 304
                               MemberDecorate 25(CB) 14 ColMajor
-                              MemberDecorate 25(CB) 14 Offset 308
                               MemberDecorate 25(CB) 14 MatrixStride 16
+                              MemberDecorate 25(CB) 14 Offset 308
                               MemberDecorate 25(CB) 15 ColMajor
-                              MemberDecorate 25(CB) 15 Offset 312
                               MemberDecorate 25(CB) 15 MatrixStride 16
+                              MemberDecorate 25(CB) 15 Offset 312
                               MemberDecorate 25(CB) 16 ColMajor
-                              MemberDecorate 25(CB) 16 Offset 320
                               MemberDecorate 25(CB) 16 MatrixStride 16
+                              MemberDecorate 25(CB) 16 Offset 320
                               MemberDecorate 25(CB) 17 ColMajor
-                              MemberDecorate 25(CB) 17 Offset 352
                               MemberDecorate 25(CB) 17 MatrixStride 16
+                              MemberDecorate 25(CB) 17 Offset 352
                               MemberDecorate 25(CB) 18 ColMajor
-                              MemberDecorate 25(CB) 18 Offset 384
                               MemberDecorate 25(CB) 18 MatrixStride 16
+                              MemberDecorate 25(CB) 18 Offset 384
                               MemberDecorate 25(CB) 19 Offset 428
                               MemberDecorate 25(CB) 20 ColMajor
-                              MemberDecorate 25(CB) 20 Offset 432
                               MemberDecorate 25(CB) 20 MatrixStride 16
+                              MemberDecorate 25(CB) 20 Offset 432
                               MemberDecorate 25(CB) 21 Offset 480
                               MemberDecorate 25(CB) 22 ColMajor
-                              MemberDecorate 25(CB) 22 Offset 496
                               MemberDecorate 25(CB) 22 MatrixStride 16
+                              MemberDecorate 25(CB) 22 Offset 496
                               MemberDecorate 25(CB) 23 Offset 556
                               MemberDecorate 25(CB) 24 Offset 560
                               MemberDecorate 25(CB) 25 Offset 596
-                              Decorate 25(CB) Block
-                              Decorate 27 DescriptorSet 0
                               Decorate 27 Binding 0
+                              Decorate 27 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                9:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.color.hull.tesc.out b/Test/baseResults/hlsl.color.hull.tesc.out
index 7a1f8305..39a7597b 100644
--- a/Test/baseResults/hlsl.color.hull.tesc.out
+++ b/Test/baseResults/hlsl.color.hull.tesc.out
@@ -583,21 +583,21 @@ triangle order = cw
                               Name 137  "param"
                               Name 142  "@patchConstantOutput.edges"
                               Name 155  "@patchConstantOutput.inside"
+                              Decorate 33(TessellationBuffer) Block
                               MemberDecorate 33(TessellationBuffer) 0 Offset 0
                               MemberDecorate 33(TessellationBuffer) 1 Offset 4
-                              Decorate 33(TessellationBuffer) Block
-                              Decorate 35 DescriptorSet 0
                               Decorate 35 Binding 0
+                              Decorate 35 DescriptorSet 0
                               Decorate 73(patch.position) Location 0
                               Decorate 80(patch.color) Location 1
                               Decorate 99(pointId) BuiltIn InvocationId
                               Decorate 102(patchId) BuiltIn PrimitiveId
                               Decorate 113(@entryPointOutput.position) Location 0
                               Decorate 120(@entryPointOutput.color) Location 1
-                              Decorate 142(@patchConstantOutput.edges) Patch
                               Decorate 142(@patchConstantOutput.edges) BuiltIn TessLevelOuter
-                              Decorate 155(@patchConstantOutput.inside) Patch
+                              Decorate 142(@patchConstantOutput.edges) Patch
                               Decorate 155(@patchConstantOutput.inside) BuiltIn TessLevelInner
+                              Decorate 155(@patchConstantOutput.inside) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.comparison.vec.frag.out b/Test/baseResults/hlsl.comparison.vec.frag.out
index 720aea24..67b82d55 100644
--- a/Test/baseResults/hlsl.comparison.vec.frag.out
+++ b/Test/baseResults/hlsl.comparison.vec.frag.out
@@ -297,10 +297,10 @@ gl_FragCoord origin is upper left
                               MemberName 93($Global) 0  "uf4"
                               Name 95  ""
                               Decorate 90(@entryPointOutput.Color) Location 0
-                              MemberDecorate 93($Global) 0 Offset 0
                               Decorate 93($Global) Block
-                              Decorate 95 DescriptorSet 0
+                              MemberDecorate 93($Global) 0 Offset 0
                               Decorate 95 Binding 0
+                              Decorate 95 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out
index 47c7877a..a56178ec 100644
--- a/Test/baseResults/hlsl.conditional.frag.out
+++ b/Test/baseResults/hlsl.conditional.frag.out
@@ -696,14 +696,14 @@ gl_FragCoord origin is upper left
                               Name 226  "input"
                               Name 229  "@entryPointOutput"
                               Name 230  "param"
+                              Decorate 29($Global) Block
                               MemberDecorate 29($Global) 0 Offset 0
                               MemberDecorate 29($Global) 1 Offset 16
                               MemberDecorate 29($Global) 2 Offset 32
                               MemberDecorate 29($Global) 3 Offset 48
                               MemberDecorate 29($Global) 4 Offset 52
-                              Decorate 29($Global) Block
-                              Decorate 31 DescriptorSet 0
                               Decorate 31 Binding 0
+                              Decorate 31 DescriptorSet 0
                               Decorate 226(input) Location 0
                               Decorate 229(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.constantbuffer.frag.out b/Test/baseResults/hlsl.constantbuffer.frag.out
index 78ad5770..e321d6d9 100644
--- a/Test/baseResults/hlsl.constantbuffer.frag.out
+++ b/Test/baseResults/hlsl.constantbuffer.frag.out
@@ -156,21 +156,21 @@ Validation failed
                               MemberName 46(cbuff) 0  "c1"
                               Name 48  ""
                               Name 64  "@entryPointOutput"
+                              Decorate 12(cb3) Block
                               MemberDecorate 12(cb3) 0 Offset 0
                               MemberDecorate 12(cb3) 1 Offset 4
-                              Decorate 12(cb3) Block
-                              Decorate 18(cb3) DescriptorSet 0
                               Decorate 18(cb3) Binding 1
-                              MemberDecorate 31(cb1) 0 Offset 0
+                              Decorate 18(cb3) DescriptorSet 0
                               Decorate 31(cb1) Block
-                              Decorate 33(cb1) DescriptorSet 0
+                              MemberDecorate 31(cb1) 0 Offset 0
                               Decorate 33(cb1) Binding 12
-                              Decorate 40(cb2) DescriptorSet 0
+                              Decorate 33(cb1) DescriptorSet 0
                               Decorate 40(cb2) Binding 0
-                              MemberDecorate 46(cbuff) 0 Offset 0
+                              Decorate 40(cb2) DescriptorSet 0
                               Decorate 46(cbuff) Block
-                              Decorate 48 DescriptorSet 0
+                              MemberDecorate 46(cbuff) 0 Offset 0
                               Decorate 48 Binding 2
+                              Decorate 48 DescriptorSet 0
                               Decorate 64(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.dashI.vert.out b/Test/baseResults/hlsl.dashI.vert.out
index ccd530af..125b4bdd 100644
--- a/Test/baseResults/hlsl.dashI.vert.out
+++ b/Test/baseResults/hlsl.dashI.vert.out
@@ -18,14 +18,14 @@ hlsl.dashI.vert
                               MemberName 11($Global) 4  "i4"
                               Name 13  ""
                               Name 38  "@entryPointOutput"
+                              Decorate 11($Global) Block
                               MemberDecorate 11($Global) 0 Offset 0
                               MemberDecorate 11($Global) 1 Offset 16
                               MemberDecorate 11($Global) 2 Offset 32
                               MemberDecorate 11($Global) 3 Offset 48
                               MemberDecorate 11($Global) 4 Offset 64
-                              Decorate 11($Global) Block
-                              Decorate 13 DescriptorSet 0
                               Decorate 13 Binding 0
+                              Decorate 13 DescriptorSet 0
                               Decorate 38(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.domain.1.tese.out b/Test/baseResults/hlsl.domain.1.tese.out
index 738f7cd0..41a5ab07 100644
--- a/Test/baseResults/hlsl.domain.1.tese.out
+++ b/Test/baseResults/hlsl.domain.1.tese.out
@@ -473,12 +473,12 @@ triangle order = none
                               Decorate 62(i.norm) Location 1
                               Decorate 82(f) Patch
                               Decorate 82(f) Location 2
-                              Decorate 85(tesscoord) Patch
                               Decorate 85(tesscoord) BuiltIn TessCoord
-                              Decorate 91(pcf_data.flTessFactor) Patch
+                              Decorate 85(tesscoord) Patch
                               Decorate 91(pcf_data.flTessFactor) BuiltIn TessLevelOuter
-                              Decorate 104(pcf_data.flInsideTessFactor) Patch
+                              Decorate 91(pcf_data.flTessFactor) Patch
                               Decorate 104(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner
+                              Decorate 104(pcf_data.flInsideTessFactor) Patch
                               Decorate 118(@entryPointOutput.pos) Location 0
                               Decorate 122(@entryPointOutput.norm) Location 1
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.domain.2.tese.out b/Test/baseResults/hlsl.domain.2.tese.out
index ddb176a0..97590ffa 100644
--- a/Test/baseResults/hlsl.domain.2.tese.out
+++ b/Test/baseResults/hlsl.domain.2.tese.out
@@ -465,16 +465,16 @@ triangle order = none
                               Name 109  "param"
                               Name 113  "@entryPointOutput.pos"
                               Name 117  "@entryPointOutput.norm"
-                              Decorate 52(pcf_data.flTessFactor) Patch
                               Decorate 52(pcf_data.flTessFactor) BuiltIn TessLevelOuter
-                              Decorate 67(pcf_data.flInsideTessFactor) Patch
+                              Decorate 52(pcf_data.flTessFactor) Patch
                               Decorate 67(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner
+                              Decorate 67(pcf_data.flInsideTessFactor) Patch
                               Decorate 71(pcf_data.foo) Patch
                               Decorate 71(pcf_data.foo) Location 2
                               Decorate 78(i.pos) Location 0
                               Decorate 85(i.norm) Location 1
-                              Decorate 103(tesscoord) Patch
                               Decorate 103(tesscoord) BuiltIn TessCoord
+                              Decorate 103(tesscoord) Patch
                               Decorate 113(@entryPointOutput.pos) Location 0
                               Decorate 117(@entryPointOutput.norm) Location 1
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.domain.3.tese.out b/Test/baseResults/hlsl.domain.3.tese.out
index 1dc7b2fd..552f3fdb 100644
--- a/Test/baseResults/hlsl.domain.3.tese.out
+++ b/Test/baseResults/hlsl.domain.3.tese.out
@@ -397,12 +397,12 @@ triangle order = none
                               Name 113  "@entryPointOutput.norm"
                               Decorate 55(i.pos) Location 0
                               Decorate 62(i.norm) Location 1
-                              Decorate 74(tesscoord) Patch
                               Decorate 74(tesscoord) BuiltIn TessCoord
-                              Decorate 83(pcf_data.flTessFactor) Patch
+                              Decorate 74(tesscoord) Patch
                               Decorate 83(pcf_data.flTessFactor) BuiltIn TessLevelOuter
-                              Decorate 97(pcf_data.flInsideTessFactor) Patch
+                              Decorate 83(pcf_data.flTessFactor) Patch
                               Decorate 97(pcf_data.flInsideTessFactor) BuiltIn TessLevelInner
+                              Decorate 97(pcf_data.flInsideTessFactor) Patch
                               Decorate 109(@entryPointOutput.pos) Location 0
                               Decorate 113(@entryPointOutput.norm) Location 1
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.earlydepthstencil.frag.out b/Test/baseResults/hlsl.earlydepthstencil.frag.out
index a629bdc7..60d90699 100644
--- a/Test/baseResults/hlsl.earlydepthstencil.frag.out
+++ b/Test/baseResults/hlsl.earlydepthstencil.frag.out
@@ -129,8 +129,8 @@ using early_fragment_tests
                               Name 41  "input.Position"
                               Name 46  "@entryPointOutput"
                               Name 47  "param"
-                              Decorate 19(Values) DescriptorSet 0
                               Decorate 19(Values) Binding 0
+                              Decorate 19(Values) DescriptorSet 0
                               Decorate 41(input.Position) BuiltIn FragCoord
                               Decorate 46(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.emptystructreturn.tesc.out b/Test/baseResults/hlsl.emptystructreturn.tesc.out
index ffdbb02d..0d82b7b2 100644
--- a/Test/baseResults/hlsl.emptystructreturn.tesc.out
+++ b/Test/baseResults/hlsl.emptystructreturn.tesc.out
@@ -439,10 +439,10 @@ Validation failed
                               Decorate 65(patch.position) BuiltIn Position
                               Decorate 79(pointId) BuiltIn InvocationId
                               Decorate 82(patchId) BuiltIn PrimitiveId
-                              Decorate 115(@patchConstantOutput.edges) Patch
                               Decorate 115(@patchConstantOutput.edges) BuiltIn TessLevelOuter
-                              Decorate 128(@patchConstantOutput.inside) Patch
+                              Decorate 115(@patchConstantOutput.edges) Patch
                               Decorate 128(@patchConstantOutput.inside) BuiltIn TessLevelInner
+                              Decorate 128(@patchConstantOutput.inside) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.entry.rename.frag.out b/Test/baseResults/hlsl.entry.rename.frag.out
index d635c67a..d1758052 100644
--- a/Test/baseResults/hlsl.entry.rename.frag.out
+++ b/Test/baseResults/hlsl.entry.rename.frag.out
@@ -92,10 +92,10 @@ gl_FragCoord origin is upper left
                               MemberName 29($Global) 0  "also_not_the_entry_point"
                               Name 31  ""
                               Decorate 26(@entryPointOutput.Color) Location 0
-                              MemberDecorate 29($Global) 0 Offset 0
                               Decorate 29($Global) Block
-                              Decorate 31 DescriptorSet 0
+                              MemberDecorate 29($Global) 0 Offset 0
                               Decorate 31 Binding 0
+                              Decorate 31 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out b/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out
index 5c89f7e0..ac6364db 100644
--- a/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out
+++ b/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out
@@ -21,19 +21,19 @@ hlsl.explicitDescriptorSet.frag
                               MemberName 25($Global) 0  "floatval_amb"
                               Name 27  ""
                               Name 30  "floatbuff"
-                              Decorate 13(g_sSamp2_amb) DescriptorSet 3
                               Decorate 13(g_sSamp2_amb) Binding 10
+                              Decorate 13(g_sSamp2_amb) DescriptorSet 3
                               Decorate 19(@entryPointOutput) Location 0
-                              Decorate 21(g_sSamp) DescriptorSet 3
                               Decorate 21(g_sSamp) Binding 11
-                              Decorate 24(g_tTex1df4) DescriptorSet 3
+                              Decorate 21(g_sSamp) DescriptorSet 3
                               Decorate 24(g_tTex1df4) Binding 20
-                              MemberDecorate 25($Global) 0 Offset 0
+                              Decorate 24(g_tTex1df4) DescriptorSet 3
                               Decorate 25($Global) Block
-                              Decorate 27 DescriptorSet 3
+                              MemberDecorate 25($Global) 0 Offset 0
                               Decorate 27 Binding 0
-                              Decorate 30(floatbuff) DescriptorSet 3
+                              Decorate 27 DescriptorSet 3
                               Decorate 30(floatbuff) Binding 0
+                              Decorate 30(floatbuff) DescriptorSet 3
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.explicitDescriptorSet.frag.out b/Test/baseResults/hlsl.explicitDescriptorSet.frag.out
index 1b0e45f0..0693f026 100644
--- a/Test/baseResults/hlsl.explicitDescriptorSet.frag.out
+++ b/Test/baseResults/hlsl.explicitDescriptorSet.frag.out
@@ -21,19 +21,19 @@ hlsl.explicitDescriptorSet.frag
                               MemberName 25($Global) 0  "floatval_amb"
                               Name 27  ""
                               Name 30  "floatbuff"
-                              Decorate 13(g_sSamp2_amb) DescriptorSet 4
                               Decorate 13(g_sSamp2_amb) Binding 10
+                              Decorate 13(g_sSamp2_amb) DescriptorSet 4
                               Decorate 19(@entryPointOutput) Location 0
-                              Decorate 21(g_sSamp) DescriptorSet 4
                               Decorate 21(g_sSamp) Binding 11
-                              Decorate 24(g_tTex1df4) DescriptorSet 4
+                              Decorate 21(g_sSamp) DescriptorSet 4
                               Decorate 24(g_tTex1df4) Binding 20
-                              MemberDecorate 25($Global) 0 Offset 0
+                              Decorate 24(g_tTex1df4) DescriptorSet 4
                               Decorate 25($Global) Block
-                              Decorate 27 DescriptorSet 4
+                              MemberDecorate 25($Global) 0 Offset 0
                               Decorate 27 Binding 0
-                              Decorate 30(floatbuff) DescriptorSet 4
+                              Decorate 27 DescriptorSet 4
                               Decorate 30(floatbuff) Binding 0
+                              Decorate 30(floatbuff) DescriptorSet 4
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.flattenOpaque.frag.out b/Test/baseResults/hlsl.flattenOpaque.frag.out
index 589b1e1f..47ea7d3f 100644
--- a/Test/baseResults/hlsl.flattenOpaque.frag.out
+++ b/Test/baseResults/hlsl.flattenOpaque.frag.out
@@ -336,14 +336,14 @@ gl_FragCoord origin is upper left
                               Name 112  "param"
                               Name 114  "param"
                               Name 120  "@entryPointOutput"
-                              Decorate 38(tex) DescriptorSet 0
                               Decorate 38(tex) Binding 0
-                              Decorate 82(s.s2D) DescriptorSet 0
+                              Decorate 38(tex) DescriptorSet 0
                               Decorate 82(s.s2D) Binding 1
-                              Decorate 97(s2.s2D) DescriptorSet 0
+                              Decorate 82(s.s2D) DescriptorSet 0
                               Decorate 97(s2.s2D) Binding 2
-                              Decorate 100(s2.tex) DescriptorSet 0
+                              Decorate 97(s2.s2D) DescriptorSet 0
                               Decorate 100(s2.tex) Binding 3
+                              Decorate 100(s2.tex) DescriptorSet 0
                               Decorate 120(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseResults/hlsl.flattenOpaqueInit.vert.out
index dbd64469..482f8182 100644
--- a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out
+++ b/Test/baseResults/hlsl.flattenOpaqueInit.vert.out
@@ -192,10 +192,10 @@ Shader version: 500
                               Name 69  "tex3"
                               Name 71  "param"
                               Name 80  "@entryPointOutput"
-                              Decorate 43(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 43(g_tInputTexture_sampler) Binding 0
-                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 43(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 47(g_tInputTexture) Binding 1
+                              Decorate 47(g_tInputTexture) DescriptorSet 0
                               Decorate 80(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out
index 66084f67..7ff5c4aa 100644
--- a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out
@@ -128,10 +128,10 @@ Shader version: 500
                               Name 47  "g_tInputTexture"
                               Name 51  "param"
                               Name 57  "@entryPointOutput"
-                              Decorate 44(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 44(g_tInputTexture_sampler) Binding 0
-                              Decorate 47(g_tInputTexture) DescriptorSet 0
+                              Decorate 44(g_tInputTexture_sampler) DescriptorSet 0
                               Decorate 47(g_tInputTexture) Binding 1
+                              Decorate 47(g_tInputTexture) DescriptorSet 0
                               Decorate 57(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.flattenSubset.frag.out b/Test/baseResults/hlsl.flattenSubset.frag.out
index 65d34677..b96c1415 100644
--- a/Test/baseResults/hlsl.flattenSubset.frag.out
+++ b/Test/baseResults/hlsl.flattenSubset.frag.out
@@ -151,10 +151,10 @@ gl_FragCoord origin is upper left
                               Name 47  "vpos"
                               Name 50  "@entryPointOutput"
                               Name 51  "param"
-                              Decorate 21(samp) DescriptorSet 0
                               Decorate 21(samp) Binding 0
-                              Decorate 33(tex) DescriptorSet 0
+                              Decorate 21(samp) DescriptorSet 0
                               Decorate 33(tex) Binding 1
+                              Decorate 33(tex) DescriptorSet 0
                               Decorate 47(vpos) Location 0
                               Decorate 50(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.flattenSubset2.frag.out b/Test/baseResults/hlsl.flattenSubset2.frag.out
index c8a91932..46cbcd4e 100644
--- a/Test/baseResults/hlsl.flattenSubset2.frag.out
+++ b/Test/baseResults/hlsl.flattenSubset2.frag.out
@@ -179,8 +179,8 @@ gl_FragCoord origin is upper left
                               Name 49  "vpos"
                               Name 52  "@entryPointOutput"
                               Name 53  "param"
-                              Decorate 36(someTex) DescriptorSet 0
                               Decorate 36(someTex) Binding 0
+                              Decorate 36(someTex) DescriptorSet 0
                               Decorate 49(vpos) Location 0
                               Decorate 52(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.float4.frag.out b/Test/baseResults/hlsl.float4.frag.out
index 5fcc3c14..8b9fc02c 100644
--- a/Test/baseResults/hlsl.float4.frag.out
+++ b/Test/baseResults/hlsl.float4.frag.out
@@ -61,14 +61,14 @@ gl_FragCoord origin is upper left
                               MemberName 15($Global) 3  "ff3"
                               MemberName 15($Global) 4  "ff4"
                               Name 17  ""
+                              Decorate 15($Global) Block
                               MemberDecorate 15($Global) 0 Offset 0
                               MemberDecorate 15($Global) 1 Offset 16
                               MemberDecorate 15($Global) 2 Offset 20
                               MemberDecorate 15($Global) 3 Offset 32
                               MemberDecorate 15($Global) 4 Offset 48
-                              Decorate 15($Global) Block
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
+                              Decorate 17 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.format.rwtexture.frag.out b/Test/baseResults/hlsl.format.rwtexture.frag.out
index 3edbbb6e..eb81229d 100644
--- a/Test/baseResults/hlsl.format.rwtexture.frag.out
+++ b/Test/baseResults/hlsl.format.rwtexture.frag.out
@@ -248,92 +248,92 @@ using depth_any
                               Name 159  "g_tTex25"
                               Decorate 29(@entryPointOutput.Color) Location 0
                               Decorate 33(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 38(g_sSamp) DescriptorSet 0
                               Decorate 38(g_sSamp) Binding 0
-                              Decorate 41(g_tTex1df4) DescriptorSet 0
+                              Decorate 38(g_sSamp) DescriptorSet 0
                               Decorate 41(g_tTex1df4) Binding 0
-                              Decorate 44(g_tTex1di4) DescriptorSet 0
+                              Decorate 41(g_tTex1df4) DescriptorSet 0
                               Decorate 44(g_tTex1di4) Binding 0
-                              Decorate 48(g_tTex1du4) DescriptorSet 0
+                              Decorate 44(g_tTex1di4) DescriptorSet 0
                               Decorate 48(g_tTex1du4) Binding 0
-                              Decorate 51(g_tTex2df4) DescriptorSet 0
+                              Decorate 48(g_tTex1du4) DescriptorSet 0
                               Decorate 51(g_tTex2df4) Binding 0
-                              Decorate 54(g_tTex2di4) DescriptorSet 0
+                              Decorate 51(g_tTex2df4) DescriptorSet 0
                               Decorate 54(g_tTex2di4) Binding 0
-                              Decorate 57(g_tTex2du4) DescriptorSet 0
+                              Decorate 54(g_tTex2di4) DescriptorSet 0
                               Decorate 57(g_tTex2du4) Binding 0
-                              Decorate 60(g_tTex3df4) DescriptorSet 0
-                              Decorate 60(g_tTex3df4) Binding 0
+                              Decorate 57(g_tTex2du4) DescriptorSet 0
                               Decorate 60(g_tTex3df4) NonWritable
-                              Decorate 63(g_tTex3di4) DescriptorSet 0
-                              Decorate 63(g_tTex3di4) Binding 0
+                              Decorate 60(g_tTex3df4) Binding 0
+                              Decorate 60(g_tTex3df4) DescriptorSet 0
                               Decorate 63(g_tTex3di4) NonReadable
-                              Decorate 66(g_tTex3du4) DescriptorSet 0
-                              Decorate 66(g_tTex3du4) Binding 0
+                              Decorate 63(g_tTex3di4) Binding 0
+                              Decorate 63(g_tTex3di4) DescriptorSet 0
                               Decorate 66(g_tTex3du4) NonWritable
                               Decorate 66(g_tTex3du4) NonReadable
-                              Decorate 69(g_tTex1df4a) DescriptorSet 0
+                              Decorate 66(g_tTex3du4) Binding 0
+                              Decorate 66(g_tTex3du4) DescriptorSet 0
                               Decorate 69(g_tTex1df4a) Binding 0
-                              Decorate 72(g_tTex1di4a) DescriptorSet 0
+                              Decorate 69(g_tTex1df4a) DescriptorSet 0
                               Decorate 72(g_tTex1di4a) Binding 0
-                              Decorate 75(g_tTex1du4a) DescriptorSet 0
+                              Decorate 72(g_tTex1di4a) DescriptorSet 0
                               Decorate 75(g_tTex1du4a) Binding 0
-                              Decorate 78(g_tTex2df4a) DescriptorSet 0
+                              Decorate 75(g_tTex1du4a) DescriptorSet 0
                               Decorate 78(g_tTex2df4a) Binding 0
-                              Decorate 81(g_tTex2di4a) DescriptorSet 0
+                              Decorate 78(g_tTex2df4a) DescriptorSet 0
                               Decorate 81(g_tTex2di4a) Binding 0
-                              Decorate 84(g_tTex2du4a) DescriptorSet 0
+                              Decorate 81(g_tTex2di4a) DescriptorSet 0
                               Decorate 84(g_tTex2du4a) Binding 0
-                              Decorate 87(g_tTex01) DescriptorSet 0
+                              Decorate 84(g_tTex2du4a) DescriptorSet 0
                               Decorate 87(g_tTex01) Binding 0
-                              Decorate 90(g_tTex02) DescriptorSet 0
+                              Decorate 87(g_tTex01) DescriptorSet 0
                               Decorate 90(g_tTex02) Binding 0
-                              Decorate 93(g_tTex03) DescriptorSet 0
+                              Decorate 90(g_tTex02) DescriptorSet 0
                               Decorate 93(g_tTex03) Binding 0
-                              Decorate 96(g_tTex04) DescriptorSet 0
+                              Decorate 93(g_tTex03) DescriptorSet 0
                               Decorate 96(g_tTex04) Binding 0
-                              Decorate 99(g_tTex05) DescriptorSet 0
+                              Decorate 96(g_tTex04) DescriptorSet 0
                               Decorate 99(g_tTex05) Binding 0
-                              Decorate 102(g_tTex06) DescriptorSet 0
+                              Decorate 99(g_tTex05) DescriptorSet 0
                               Decorate 102(g_tTex06) Binding 0
-                              Decorate 105(g_tTex07) DescriptorSet 0
+                              Decorate 102(g_tTex06) DescriptorSet 0
                               Decorate 105(g_tTex07) Binding 0
-                              Decorate 108(g_tTex08) DescriptorSet 0
+                              Decorate 105(g_tTex07) DescriptorSet 0
                               Decorate 108(g_tTex08) Binding 0
-                              Decorate 111(g_tTex09) DescriptorSet 0
+                              Decorate 108(g_tTex08) DescriptorSet 0
                               Decorate 111(g_tTex09) Binding 0
-                              Decorate 114(g_tTex10) DescriptorSet 0
+                              Decorate 111(g_tTex09) DescriptorSet 0
                               Decorate 114(g_tTex10) Binding 0
-                              Decorate 117(g_tTex11) DescriptorSet 0
+                              Decorate 114(g_tTex10) DescriptorSet 0
                               Decorate 117(g_tTex11) Binding 0
-                              Decorate 120(g_tTex12) DescriptorSet 0
+                              Decorate 117(g_tTex11) DescriptorSet 0
                               Decorate 120(g_tTex12) Binding 0
-                              Decorate 123(g_tTex13) DescriptorSet 0
+                              Decorate 120(g_tTex12) DescriptorSet 0
                               Decorate 123(g_tTex13) Binding 0
-                              Decorate 126(g_tTex14) DescriptorSet 0
+                              Decorate 123(g_tTex13) DescriptorSet 0
                               Decorate 126(g_tTex14) Binding 0
-                              Decorate 129(g_tTex15) DescriptorSet 0
+                              Decorate 126(g_tTex14) DescriptorSet 0
                               Decorate 129(g_tTex15) Binding 0
-                              Decorate 132(g_tTex16) DescriptorSet 0
+                              Decorate 129(g_tTex15) DescriptorSet 0
                               Decorate 132(g_tTex16) Binding 0
-                              Decorate 135(g_tTex17) DescriptorSet 0
+                              Decorate 132(g_tTex16) DescriptorSet 0
                               Decorate 135(g_tTex17) Binding 0
-                              Decorate 138(g_tTex18) DescriptorSet 0
+                              Decorate 135(g_tTex17) DescriptorSet 0
                               Decorate 138(g_tTex18) Binding 0
-                              Decorate 141(g_tTex19) DescriptorSet 0
+                              Decorate 138(g_tTex18) DescriptorSet 0
                               Decorate 141(g_tTex19) Binding 0
-                              Decorate 144(g_tTex20) DescriptorSet 0
+                              Decorate 141(g_tTex19) DescriptorSet 0
                               Decorate 144(g_tTex20) Binding 0
-                              Decorate 147(g_tTex21) DescriptorSet 0
+                              Decorate 144(g_tTex20) DescriptorSet 0
                               Decorate 147(g_tTex21) Binding 0
-                              Decorate 150(g_tTex22) DescriptorSet 0
+                              Decorate 147(g_tTex21) DescriptorSet 0
                               Decorate 150(g_tTex22) Binding 0
-                              Decorate 153(g_tTex23) DescriptorSet 0
+                              Decorate 150(g_tTex22) DescriptorSet 0
                               Decorate 153(g_tTex23) Binding 0
-                              Decorate 156(g_tTex24) DescriptorSet 0
+                              Decorate 153(g_tTex23) DescriptorSet 0
                               Decorate 156(g_tTex24) Binding 0
-                              Decorate 159(g_tTex25) DescriptorSet 0
+                              Decorate 156(g_tTex24) DescriptorSet 0
                               Decorate 159(g_tTex25) Binding 0
+                              Decorate 159(g_tTex25) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out
index 13b7ebb3..e0a1901f 100644
--- a/Test/baseResults/hlsl.gather.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.array.dx10.frag.out
@@ -300,30 +300,30 @@ using depth_any
                               Name 117  "g_tTex1df4"
                               Name 120  "g_tTex1di4a"
                               Name 123  "g_tTex1du4a"
-                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 16(g_tTex2df4a) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 37(g_tTex2di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 37(g_tTex2di4a) Binding 3
-                              Decorate 52(g_tTex2du4a) DescriptorSet 0
+                              Decorate 37(g_tTex2di4a) DescriptorSet 0
                               Decorate 52(g_tTex2du4a) Binding 4
-                              Decorate 64(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 52(g_tTex2du4a) DescriptorSet 0
                               Decorate 64(g_tTexcdf4a) Binding 5
-                              Decorate 74(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 64(g_tTexcdf4a) DescriptorSet 0
                               Decorate 74(g_tTexcdi4a) Binding 6
-                              Decorate 84(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 74(g_tTexcdi4a) DescriptorSet 0
                               Decorate 84(g_tTexcdu4a) Binding 7
+                              Decorate 84(g_tTexcdu4a) DescriptorSet 0
                               Decorate 107(@entryPointOutput.Color) Location 0
                               Decorate 111(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 116(g_tTex1df4a) DescriptorSet 0
                               Decorate 116(g_tTex1df4a) Binding 1
-                              Decorate 117(g_tTex1df4) DescriptorSet 0
+                              Decorate 116(g_tTex1df4a) DescriptorSet 0
                               Decorate 117(g_tTex1df4) Binding 0
-                              Decorate 120(g_tTex1di4a) DescriptorSet 0
+                              Decorate 117(g_tTex1df4) DescriptorSet 0
                               Decorate 120(g_tTex1di4a) Binding 0
-                              Decorate 123(g_tTex1du4a) DescriptorSet 0
+                              Decorate 120(g_tTex1di4a) DescriptorSet 0
                               Decorate 123(g_tTex1du4a) Binding 0
+                              Decorate 123(g_tTex1du4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out
index 0aa00f74..6a9df41d 100644
--- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.basic.dx10.frag.out
@@ -299,38 +299,38 @@ using depth_any
                               Name 128  "g_tTex3df4"
                               Name 131  "g_tTex3di4"
                               Name 134  "g_tTex3du4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex2di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex2di4) Binding 3
-                              Decorate 51(g_tTex2du4) DescriptorSet 0
+                              Decorate 36(g_tTex2di4) DescriptorSet 0
                               Decorate 51(g_tTex2du4) Binding 4
-                              Decorate 63(g_tTexcdf4) DescriptorSet 0
+                              Decorate 51(g_tTex2du4) DescriptorSet 0
                               Decorate 63(g_tTexcdf4) Binding 5
-                              Decorate 74(g_tTexcdi4) DescriptorSet 0
+                              Decorate 63(g_tTexcdf4) DescriptorSet 0
                               Decorate 74(g_tTexcdi4) Binding 6
-                              Decorate 84(g_tTexcdu4) DescriptorSet 0
+                              Decorate 74(g_tTexcdi4) DescriptorSet 0
                               Decorate 84(g_tTexcdu4) Binding 7
+                              Decorate 84(g_tTexcdu4) DescriptorSet 0
                               Decorate 108(@entryPointOutput.Color) Location 0
                               Decorate 112(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 115(g_sSamp2d) DescriptorSet 0
                               Decorate 115(g_sSamp2d) Binding 0
-                              Decorate 118(g_tTex1df4a) DescriptorSet 0
+                              Decorate 115(g_sSamp2d) DescriptorSet 0
                               Decorate 118(g_tTex1df4a) Binding 1
-                              Decorate 119(g_tTex1df4) DescriptorSet 0
+                              Decorate 118(g_tTex1df4a) DescriptorSet 0
                               Decorate 119(g_tTex1df4) Binding 0
-                              Decorate 122(g_tTex1di4) DescriptorSet 0
+                              Decorate 119(g_tTex1df4) DescriptorSet 0
                               Decorate 122(g_tTex1di4) Binding 0
-                              Decorate 125(g_tTex1du4) DescriptorSet 0
+                              Decorate 122(g_tTex1di4) DescriptorSet 0
                               Decorate 125(g_tTex1du4) Binding 0
-                              Decorate 128(g_tTex3df4) DescriptorSet 0
+                              Decorate 125(g_tTex1du4) DescriptorSet 0
                               Decorate 128(g_tTex3df4) Binding 0
-                              Decorate 131(g_tTex3di4) DescriptorSet 0
+                              Decorate 128(g_tTex3df4) DescriptorSet 0
                               Decorate 131(g_tTex3di4) Binding 0
-                              Decorate 134(g_tTex3du4) DescriptorSet 0
+                              Decorate 131(g_tTex3di4) DescriptorSet 0
                               Decorate 134(g_tTex3du4) Binding 0
+                              Decorate 134(g_tTex3du4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out
index d743074e..8bffb131 100644
--- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.gather.basic.dx10.vert.out
@@ -256,37 +256,37 @@ Shader version: 500
                               Name 119  "g_tTex3df4"
                               Name 122  "g_tTex3di4"
                               Name 125  "g_tTex3du4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex2di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex2di4) Binding 3
-                              Decorate 51(g_tTex2du4) DescriptorSet 0
+                              Decorate 36(g_tTex2di4) DescriptorSet 0
                               Decorate 51(g_tTex2du4) Binding 4
-                              Decorate 63(g_tTexcdf4) DescriptorSet 0
+                              Decorate 51(g_tTex2du4) DescriptorSet 0
                               Decorate 63(g_tTexcdf4) Binding 5
-                              Decorate 74(g_tTexcdi4) DescriptorSet 0
+                              Decorate 63(g_tTexcdf4) DescriptorSet 0
                               Decorate 74(g_tTexcdi4) Binding 6
-                              Decorate 84(g_tTexcdu4) DescriptorSet 0
+                              Decorate 74(g_tTexcdi4) DescriptorSet 0
                               Decorate 84(g_tTexcdu4) Binding 7
+                              Decorate 84(g_tTexcdu4) DescriptorSet 0
                               Decorate 103(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 106(g_sSamp2d) DescriptorSet 0
                               Decorate 106(g_sSamp2d) Binding 0
-                              Decorate 109(g_tTex1df4a) DescriptorSet 0
+                              Decorate 106(g_sSamp2d) DescriptorSet 0
                               Decorate 109(g_tTex1df4a) Binding 1
-                              Decorate 110(g_tTex1df4) DescriptorSet 0
+                              Decorate 109(g_tTex1df4a) DescriptorSet 0
                               Decorate 110(g_tTex1df4) Binding 0
-                              Decorate 113(g_tTex1di4) DescriptorSet 0
+                              Decorate 110(g_tTex1df4) DescriptorSet 0
                               Decorate 113(g_tTex1di4) Binding 0
-                              Decorate 116(g_tTex1du4) DescriptorSet 0
+                              Decorate 113(g_tTex1di4) DescriptorSet 0
                               Decorate 116(g_tTex1du4) Binding 0
-                              Decorate 119(g_tTex3df4) DescriptorSet 0
+                              Decorate 116(g_tTex1du4) DescriptorSet 0
                               Decorate 119(g_tTex3df4) Binding 0
-                              Decorate 122(g_tTex3di4) DescriptorSet 0
+                              Decorate 119(g_tTex3df4) DescriptorSet 0
                               Decorate 122(g_tTex3di4) Binding 0
-                              Decorate 125(g_tTex3du4) DescriptorSet 0
+                              Decorate 122(g_tTex3di4) DescriptorSet 0
                               Decorate 125(g_tTex3du4) Binding 0
+                              Decorate 125(g_tTex3du4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out
index 9656db57..ae409bbd 100644
--- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.offset.dx10.frag.out
@@ -245,36 +245,36 @@ using depth_any
                               Name 107  "g_tTexcdf4"
                               Name 110  "g_tTexcdi4"
                               Name 113  "g_tTexcdu4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 39(g_tTex2di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 39(g_tTex2di4) Binding 3
-                              Decorate 55(g_tTex2du4) DescriptorSet 0
+                              Decorate 39(g_tTex2di4) DescriptorSet 0
                               Decorate 55(g_tTex2du4) Binding 4
+                              Decorate 55(g_tTex2du4) DescriptorSet 0
                               Decorate 79(@entryPointOutput.Color) Location 0
                               Decorate 83(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 88(g_tTex1df4a) DescriptorSet 0
                               Decorate 88(g_tTex1df4a) Binding 1
-                              Decorate 89(g_tTex1df4) DescriptorSet 0
+                              Decorate 88(g_tTex1df4a) DescriptorSet 0
                               Decorate 89(g_tTex1df4) Binding 0
-                              Decorate 92(g_tTex1di4) DescriptorSet 0
+                              Decorate 89(g_tTex1df4) DescriptorSet 0
                               Decorate 92(g_tTex1di4) Binding 0
-                              Decorate 95(g_tTex1du4) DescriptorSet 0
+                              Decorate 92(g_tTex1di4) DescriptorSet 0
                               Decorate 95(g_tTex1du4) Binding 0
-                              Decorate 98(g_tTex3df4) DescriptorSet 0
+                              Decorate 95(g_tTex1du4) DescriptorSet 0
                               Decorate 98(g_tTex3df4) Binding 0
-                              Decorate 101(g_tTex3di4) DescriptorSet 0
+                              Decorate 98(g_tTex3df4) DescriptorSet 0
                               Decorate 101(g_tTex3di4) Binding 0
-                              Decorate 104(g_tTex3du4) DescriptorSet 0
+                              Decorate 101(g_tTex3di4) DescriptorSet 0
                               Decorate 104(g_tTex3du4) Binding 0
-                              Decorate 107(g_tTexcdf4) DescriptorSet 0
+                              Decorate 104(g_tTex3du4) DescriptorSet 0
                               Decorate 107(g_tTexcdf4) Binding 0
-                              Decorate 110(g_tTexcdi4) DescriptorSet 0
+                              Decorate 107(g_tTexcdf4) DescriptorSet 0
                               Decorate 110(g_tTexcdi4) Binding 0
-                              Decorate 113(g_tTexcdu4) DescriptorSet 0
+                              Decorate 110(g_tTexcdi4) DescriptorSet 0
                               Decorate 113(g_tTexcdu4) Binding 0
+                              Decorate 113(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
index 2e6221a2..695428ae 100644
--- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
@@ -233,24 +233,24 @@ using depth_any
                               Name 90  "g_tTex1df4"
                               Name 93  "g_tTex1di4"
                               Name 96  "g_tTex1du4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 40(g_tTex2di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 40(g_tTex2di4) Binding 3
-                              Decorate 55(g_tTex2du4) DescriptorSet 0
+                              Decorate 40(g_tTex2di4) DescriptorSet 0
                               Decorate 55(g_tTex2du4) Binding 4
+                              Decorate 55(g_tTex2du4) DescriptorSet 0
                               Decorate 80(@entryPointOutput.Color) Location 0
                               Decorate 84(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 89(g_tTex1df4a) DescriptorSet 0
                               Decorate 89(g_tTex1df4a) Binding 1
-                              Decorate 90(g_tTex1df4) DescriptorSet 0
+                              Decorate 89(g_tTex1df4a) DescriptorSet 0
                               Decorate 90(g_tTex1df4) Binding 0
-                              Decorate 93(g_tTex1di4) DescriptorSet 0
+                              Decorate 90(g_tTex1df4) DescriptorSet 0
                               Decorate 93(g_tTex1di4) Binding 0
-                              Decorate 96(g_tTex1du4) DescriptorSet 0
+                              Decorate 93(g_tTex1di4) DescriptorSet 0
                               Decorate 96(g_tTex1du4) Binding 0
+                              Decorate 96(g_tTex1du4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
index 904aaece..3bf68b55 100644
--- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
@@ -812,37 +812,37 @@ using depth_any
                               Name 248  "g_tTex1df4a"
                               Name 251  "g_tTex1di4a"
                               Name 254  "g_tTex1du4a"
-                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 16(g_tTex2df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 26($Global) Block
                               MemberDecorate 26($Global) 0 Offset 0
                               MemberDecorate 26($Global) 1 Offset 8
                               MemberDecorate 26($Global) 2 Offset 16
                               MemberDecorate 26($Global) 3 Offset 32
-                              Decorate 26($Global) Block
-                              Decorate 28 DescriptorSet 0
                               Decorate 28 Binding 7
-                              Decorate 41(g_tTex2di4a) DescriptorSet 0
+                              Decorate 28 DescriptorSet 0
                               Decorate 41(g_tTex2di4a) Binding 2
-                              Decorate 55(g_tTex2du4a) DescriptorSet 0
+                              Decorate 41(g_tTex2di4a) DescriptorSet 0
                               Decorate 55(g_tTex2du4a) Binding 3
-                              Decorate 131(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 55(g_tTex2du4a) DescriptorSet 0
                               Decorate 131(g_tTexcdf4a) Binding 4
-                              Decorate 143(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 131(g_tTexcdf4a) DescriptorSet 0
                               Decorate 143(g_tTexcdi4a) Binding 5
-                              Decorate 154(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 143(g_tTexcdi4a) DescriptorSet 0
                               Decorate 154(g_tTexcdu4a) Binding 6
+                              Decorate 154(g_tTexcdu4a) DescriptorSet 0
                               Decorate 238(@entryPointOutput.Color) Location 0
                               Decorate 242(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 245(g_sSamp2d) DescriptorSet 0
                               Decorate 245(g_sSamp2d) Binding 0
-                              Decorate 248(g_tTex1df4a) DescriptorSet 0
+                              Decorate 245(g_sSamp2d) DescriptorSet 0
                               Decorate 248(g_tTex1df4a) Binding 0
-                              Decorate 251(g_tTex1di4a) DescriptorSet 0
+                              Decorate 248(g_tTex1df4a) DescriptorSet 0
                               Decorate 251(g_tTex1di4a) Binding 0
-                              Decorate 254(g_tTex1du4a) DescriptorSet 0
+                              Decorate 251(g_tTex1di4a) DescriptorSet 0
                               Decorate 254(g_tTex1du4a) Binding 0
+                              Decorate 254(g_tTex1du4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
index f8fa2f46..e94789a3 100644
--- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
@@ -823,45 +823,45 @@ using depth_any
                               Name 258  "g_tTex3df4"
                               Name 261  "g_tTex3di4"
                               Name 264  "g_tTex3du4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 26($Global) Block
                               MemberDecorate 26($Global) 0 Offset 0
                               MemberDecorate 26($Global) 1 Offset 8
                               MemberDecorate 26($Global) 2 Offset 16
                               MemberDecorate 26($Global) 3 Offset 32
-                              Decorate 26($Global) Block
-                              Decorate 28 DescriptorSet 0
                               Decorate 28 Binding 8
-                              Decorate 41(g_tTex2di4) DescriptorSet 0
+                              Decorate 28 DescriptorSet 0
                               Decorate 41(g_tTex2di4) Binding 3
-                              Decorate 55(g_tTex2du4) DescriptorSet 0
+                              Decorate 41(g_tTex2di4) DescriptorSet 0
                               Decorate 55(g_tTex2du4) Binding 4
-                              Decorate 131(g_tTexcdf4) DescriptorSet 0
+                              Decorate 55(g_tTex2du4) DescriptorSet 0
                               Decorate 131(g_tTexcdf4) Binding 5
-                              Decorate 143(g_tTexcdi4) DescriptorSet 0
+                              Decorate 131(g_tTexcdf4) DescriptorSet 0
                               Decorate 143(g_tTexcdi4) Binding 6
-                              Decorate 154(g_tTexcdu4) DescriptorSet 0
+                              Decorate 143(g_tTexcdi4) DescriptorSet 0
                               Decorate 154(g_tTexcdu4) Binding 7
+                              Decorate 154(g_tTexcdu4) DescriptorSet 0
                               Decorate 238(@entryPointOutput.Color) Location 0
                               Decorate 242(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 245(g_sSamp2d) DescriptorSet 0
                               Decorate 245(g_sSamp2d) Binding 0
-                              Decorate 248(g_tTex1df4a) DescriptorSet 0
+                              Decorate 245(g_sSamp2d) DescriptorSet 0
                               Decorate 248(g_tTex1df4a) Binding 1
-                              Decorate 249(g_tTex1df4) DescriptorSet 0
+                              Decorate 248(g_tTex1df4a) DescriptorSet 0
                               Decorate 249(g_tTex1df4) Binding 0
-                              Decorate 252(g_tTex1di4) DescriptorSet 0
+                              Decorate 249(g_tTex1df4) DescriptorSet 0
                               Decorate 252(g_tTex1di4) Binding 0
-                              Decorate 255(g_tTex1du4) DescriptorSet 0
+                              Decorate 252(g_tTex1di4) DescriptorSet 0
                               Decorate 255(g_tTex1du4) Binding 0
-                              Decorate 258(g_tTex3df4) DescriptorSet 0
+                              Decorate 255(g_tTex1du4) DescriptorSet 0
                               Decorate 258(g_tTex3df4) Binding 0
-                              Decorate 261(g_tTex3di4) DescriptorSet 0
+                              Decorate 258(g_tTex3df4) DescriptorSet 0
                               Decorate 261(g_tTex3di4) Binding 0
-                              Decorate 264(g_tTex3du4) DescriptorSet 0
+                              Decorate 261(g_tTex3di4) DescriptorSet 0
                               Decorate 264(g_tTex3du4) Binding 0
+                              Decorate 264(g_tTex3du4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
index 63cb39fc..165c10c9 100644
--- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
@@ -1333,10 +1333,11 @@ Validation failed
                               Name 392  "g_tTexcdf4"
                               Name 395  "g_tTexcdi4"
                               Name 398  "g_tTexcdu4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 30($Global) Block
                               MemberDecorate 30($Global) 0 Offset 0
                               MemberDecorate 30($Global) 1 Offset 8
                               MemberDecorate 30($Global) 2 Offset 16
@@ -1345,37 +1346,36 @@ Validation failed
                               MemberDecorate 30($Global) 5 Offset 56
                               MemberDecorate 30($Global) 6 Offset 64
                               MemberDecorate 30($Global) 7 Offset 80
-                              Decorate 30($Global) Block
-                              Decorate 32 DescriptorSet 0
                               Decorate 32 Binding 5
-                              Decorate 47(g_tTex2di4) DescriptorSet 0
+                              Decorate 32 DescriptorSet 0
                               Decorate 47(g_tTex2di4) Binding 3
-                              Decorate 63(g_tTex2du4) DescriptorSet 0
+                              Decorate 47(g_tTex2di4) DescriptorSet 0
                               Decorate 63(g_tTex2du4) Binding 4
+                              Decorate 63(g_tTex2du4) DescriptorSet 0
                               Decorate 363(@entryPointOutput.Color) Location 0
                               Decorate 367(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 370(g_sSamp2d) DescriptorSet 0
                               Decorate 370(g_sSamp2d) Binding 0
-                              Decorate 373(g_tTex1df4a) DescriptorSet 0
+                              Decorate 370(g_sSamp2d) DescriptorSet 0
                               Decorate 373(g_tTex1df4a) Binding 1
-                              Decorate 374(g_tTex1df4) DescriptorSet 0
+                              Decorate 373(g_tTex1df4a) DescriptorSet 0
                               Decorate 374(g_tTex1df4) Binding 0
-                              Decorate 377(g_tTex1di4) DescriptorSet 0
+                              Decorate 374(g_tTex1df4) DescriptorSet 0
                               Decorate 377(g_tTex1di4) Binding 0
-                              Decorate 380(g_tTex1du4) DescriptorSet 0
+                              Decorate 377(g_tTex1di4) DescriptorSet 0
                               Decorate 380(g_tTex1du4) Binding 0
-                              Decorate 383(g_tTex3df4) DescriptorSet 0
+                              Decorate 380(g_tTex1du4) DescriptorSet 0
                               Decorate 383(g_tTex3df4) Binding 0
-                              Decorate 386(g_tTex3di4) DescriptorSet 0
+                              Decorate 383(g_tTex3df4) DescriptorSet 0
                               Decorate 386(g_tTex3di4) Binding 0
-                              Decorate 389(g_tTex3du4) DescriptorSet 0
+                              Decorate 386(g_tTex3di4) DescriptorSet 0
                               Decorate 389(g_tTex3du4) Binding 0
-                              Decorate 392(g_tTexcdf4) DescriptorSet 0
+                              Decorate 389(g_tTex3du4) DescriptorSet 0
                               Decorate 392(g_tTexcdf4) Binding 0
-                              Decorate 395(g_tTexcdi4) DescriptorSet 0
+                              Decorate 392(g_tTexcdf4) DescriptorSet 0
                               Decorate 395(g_tTexcdi4) Binding 0
-                              Decorate 398(g_tTexcdu4) DescriptorSet 0
+                              Decorate 395(g_tTexcdi4) DescriptorSet 0
                               Decorate 398(g_tTexcdu4) Binding 0
+                              Decorate 398(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
index da83e011..42360c59 100644
--- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
@@ -1322,10 +1322,11 @@ Validation failed
                               Name 382  "g_tTexcdf4a"
                               Name 385  "g_tTexcdi4a"
                               Name 388  "g_tTexcdu4a"
-                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 16(g_tTex2df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 30($Global) Block
                               MemberDecorate 30($Global) 0 Offset 0
                               MemberDecorate 30($Global) 1 Offset 8
                               MemberDecorate 30($Global) 2 Offset 16
@@ -1334,29 +1335,28 @@ Validation failed
                               MemberDecorate 30($Global) 5 Offset 56
                               MemberDecorate 30($Global) 6 Offset 64
                               MemberDecorate 30($Global) 7 Offset 80
-                              Decorate 30($Global) Block
-                              Decorate 32 DescriptorSet 0
                               Decorate 32 Binding 4
-                              Decorate 47(g_tTex2di4a) DescriptorSet 0
+                              Decorate 32 DescriptorSet 0
                               Decorate 47(g_tTex2di4a) Binding 2
-                              Decorate 63(g_tTex2du4a) DescriptorSet 0
+                              Decorate 47(g_tTex2di4a) DescriptorSet 0
                               Decorate 63(g_tTex2du4a) Binding 3
+                              Decorate 63(g_tTex2du4a) DescriptorSet 0
                               Decorate 363(@entryPointOutput.Color) Location 0
                               Decorate 367(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 370(g_sSamp2d) DescriptorSet 0
                               Decorate 370(g_sSamp2d) Binding 0
-                              Decorate 373(g_tTex1df4a) DescriptorSet 0
+                              Decorate 370(g_sSamp2d) DescriptorSet 0
                               Decorate 373(g_tTex1df4a) Binding 0
-                              Decorate 376(g_tTex1di4a) DescriptorSet 0
+                              Decorate 373(g_tTex1df4a) DescriptorSet 0
                               Decorate 376(g_tTex1di4a) Binding 0
-                              Decorate 379(g_tTex1du4a) DescriptorSet 0
+                              Decorate 376(g_tTex1di4a) DescriptorSet 0
                               Decorate 379(g_tTex1du4a) Binding 0
-                              Decorate 382(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 379(g_tTex1du4a) DescriptorSet 0
                               Decorate 382(g_tTexcdf4a) Binding 0
-                              Decorate 385(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 382(g_tTexcdf4a) DescriptorSet 0
                               Decorate 385(g_tTexcdi4a) Binding 0
-                              Decorate 388(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 385(g_tTexcdi4a) DescriptorSet 0
                               Decorate 388(g_tTexcdu4a) Binding 0
+                              Decorate 388(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
index ff834ec4..b734da5e 100644
--- a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
@@ -506,43 +506,43 @@ using depth_any
                               Name 157  "g_tTexcdf4"
                               Name 160  "g_tTexcdi4"
                               Name 163  "g_tTexcdu4"
-                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 16(g_tTex2df4) Binding 2
-                              Decorate 20(g_sSampCmp) DescriptorSet 0
+                              Decorate 16(g_tTex2df4) DescriptorSet 0
                               Decorate 20(g_sSampCmp) Binding 0
+                              Decorate 20(g_sSampCmp) DescriptorSet 0
+                              Decorate 26($Global) Block
                               MemberDecorate 26($Global) 0 Offset 0
                               MemberDecorate 26($Global) 1 Offset 8
                               MemberDecorate 26($Global) 2 Offset 16
                               MemberDecorate 26($Global) 3 Offset 32
-                              Decorate 26($Global) Block
-                              Decorate 28 DescriptorSet 0
                               Decorate 28 Binding 5
-                              Decorate 44(g_tTex2di4) DescriptorSet 0
+                              Decorate 28 DescriptorSet 0
                               Decorate 44(g_tTex2di4) Binding 3
-                              Decorate 60(g_tTex2du4) DescriptorSet 0
+                              Decorate 44(g_tTex2di4) DescriptorSet 0
                               Decorate 60(g_tTex2du4) Binding 4
+                              Decorate 60(g_tTex2du4) DescriptorSet 0
                               Decorate 129(@entryPointOutput.Color) Location 0
                               Decorate 133(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 138(g_tTex1df4a) DescriptorSet 0
                               Decorate 138(g_tTex1df4a) Binding 1
-                              Decorate 139(g_tTex1df4) DescriptorSet 0
+                              Decorate 138(g_tTex1df4a) DescriptorSet 0
                               Decorate 139(g_tTex1df4) Binding 0
-                              Decorate 142(g_tTex1di4) DescriptorSet 0
+                              Decorate 139(g_tTex1df4) DescriptorSet 0
                               Decorate 142(g_tTex1di4) Binding 0
-                              Decorate 145(g_tTex1du4) DescriptorSet 0
+                              Decorate 142(g_tTex1di4) DescriptorSet 0
                               Decorate 145(g_tTex1du4) Binding 0
-                              Decorate 148(g_tTex3df4) DescriptorSet 0
+                              Decorate 145(g_tTex1du4) DescriptorSet 0
                               Decorate 148(g_tTex3df4) Binding 0
-                              Decorate 151(g_tTex3di4) DescriptorSet 0
+                              Decorate 148(g_tTex3df4) DescriptorSet 0
                               Decorate 151(g_tTex3di4) Binding 0
-                              Decorate 154(g_tTex3du4) DescriptorSet 0
+                              Decorate 151(g_tTex3di4) DescriptorSet 0
                               Decorate 154(g_tTex3du4) Binding 0
-                              Decorate 157(g_tTexcdf4) DescriptorSet 0
+                              Decorate 154(g_tTex3du4) DescriptorSet 0
                               Decorate 157(g_tTexcdf4) Binding 0
-                              Decorate 160(g_tTexcdi4) DescriptorSet 0
+                              Decorate 157(g_tTexcdf4) DescriptorSet 0
                               Decorate 160(g_tTexcdi4) Binding 0
-                              Decorate 163(g_tTexcdu4) DescriptorSet 0
+                              Decorate 160(g_tTexcdi4) DescriptorSet 0
                               Decorate 163(g_tTexcdu4) Binding 0
+                              Decorate 163(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
index 9e1d5439..18d55009 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
@@ -2422,64 +2422,64 @@ using depth_any
                               Name 540  "@entryPointOutput.Color"
                               Name 544  "@entryPointOutput.Depth"
                               Name 549  "g_sSamp"
-                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 17(g_tTex1df4) Binding 0
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 1
-                              Decorate 48(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 48(g_tTex1du4) Binding 2
-                              Decorate 63(g_tTex1df4a) DescriptorSet 0
+                              Decorate 48(g_tTex1du4) DescriptorSet 0
                               Decorate 63(g_tTex1df4a) Binding 12
-                              Decorate 85(g_tTex1di4a) DescriptorSet 0
+                              Decorate 63(g_tTex1df4a) DescriptorSet 0
                               Decorate 85(g_tTex1di4a) Binding 13
-                              Decorate 104(g_tTex1du4a) DescriptorSet 0
+                              Decorate 85(g_tTex1di4a) DescriptorSet 0
                               Decorate 104(g_tTex1du4a) Binding 14
-                              Decorate 123(g_tTex2df4) DescriptorSet 0
+                              Decorate 104(g_tTex1du4a) DescriptorSet 0
                               Decorate 123(g_tTex2df4) Binding 3
-                              Decorate 143(g_tTex2di4) DescriptorSet 0
+                              Decorate 123(g_tTex2df4) DescriptorSet 0
                               Decorate 143(g_tTex2di4) Binding 4
-                              Decorate 162(g_tTex2du4) DescriptorSet 0
+                              Decorate 143(g_tTex2di4) DescriptorSet 0
                               Decorate 162(g_tTex2du4) Binding 5
-                              Decorate 183(g_tTex2df4a) DescriptorSet 0
+                              Decorate 162(g_tTex2du4) DescriptorSet 0
                               Decorate 183(g_tTex2df4a) Binding 15
-                              Decorate 207(g_tTex2di4a) DescriptorSet 0
+                              Decorate 183(g_tTex2df4a) DescriptorSet 0
                               Decorate 207(g_tTex2di4a) Binding 16
-                              Decorate 230(g_tTex2du4a) DescriptorSet 0
+                              Decorate 207(g_tTex2di4a) DescriptorSet 0
                               Decorate 230(g_tTex2du4a) Binding 17
-                              Decorate 253(g_tTex3df4) DescriptorSet 0
+                              Decorate 230(g_tTex2du4a) DescriptorSet 0
                               Decorate 253(g_tTex3df4) Binding 6
-                              Decorate 277(g_tTex3di4) DescriptorSet 0
+                              Decorate 253(g_tTex3df4) DescriptorSet 0
                               Decorate 277(g_tTex3di4) Binding 7
-                              Decorate 300(g_tTex3du4) DescriptorSet 0
+                              Decorate 277(g_tTex3di4) DescriptorSet 0
                               Decorate 300(g_tTex3du4) Binding 8
-                              Decorate 323(g_tTexcdf4) DescriptorSet 0
+                              Decorate 300(g_tTex3du4) DescriptorSet 0
                               Decorate 323(g_tTexcdf4) Binding 9
-                              Decorate 342(g_tTexcdi4) DescriptorSet 0
+                              Decorate 323(g_tTexcdf4) DescriptorSet 0
                               Decorate 342(g_tTexcdi4) Binding 10
-                              Decorate 361(g_tTexcdu4) DescriptorSet 0
+                              Decorate 342(g_tTexcdi4) DescriptorSet 0
                               Decorate 361(g_tTexcdu4) Binding 11
-                              Decorate 380(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 361(g_tTexcdu4) DescriptorSet 0
                               Decorate 380(g_tTexcdf4a) Binding 18
-                              Decorate 403(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 380(g_tTexcdf4a) DescriptorSet 0
                               Decorate 403(g_tTexcdi4a) Binding 19
-                              Decorate 426(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 403(g_tTexcdi4a) DescriptorSet 0
                               Decorate 426(g_tTexcdu4a) Binding 20
-                              Decorate 449(g_tTex2dmsf4) DescriptorSet 0
+                              Decorate 426(g_tTexcdu4a) DescriptorSet 0
                               Decorate 449(g_tTex2dmsf4) Binding 21
-                              Decorate 462(g_tTex2dmsi4) DescriptorSet 0
+                              Decorate 449(g_tTex2dmsf4) DescriptorSet 0
                               Decorate 462(g_tTex2dmsi4) Binding 22
-                              Decorate 474(g_tTex2dmsu4) DescriptorSet 0
+                              Decorate 462(g_tTex2dmsi4) DescriptorSet 0
                               Decorate 474(g_tTex2dmsu4) Binding 23
-                              Decorate 486(g_tTex2dmsf4a) DescriptorSet 0
+                              Decorate 474(g_tTex2dmsu4) DescriptorSet 0
                               Decorate 486(g_tTex2dmsf4a) Binding 24
-                              Decorate 500(g_tTex2dmsi4a) DescriptorSet 0
+                              Decorate 486(g_tTex2dmsf4a) DescriptorSet 0
                               Decorate 500(g_tTex2dmsi4a) Binding 25
-                              Decorate 514(g_tTex2dmsu4a) DescriptorSet 0
+                              Decorate 500(g_tTex2dmsi4a) DescriptorSet 0
                               Decorate 514(g_tTex2dmsu4a) Binding 26
+                              Decorate 514(g_tTex2dmsu4a) DescriptorSet 0
                               Decorate 540(@entryPointOutput.Color) Location 0
                               Decorate 544(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 549(g_sSamp) DescriptorSet 0
                               Decorate 549(g_sSamp) Binding 0
+                              Decorate 549(g_sSamp) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
index a7d27a86..925dd7e3 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
@@ -138,11 +138,11 @@ Shader version: 500
                               Name 33  "vsout"
                               Name 42  "@entryPointOutput.Pos"
                               Name 47  "g_sSamp"
-                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 17(g_tTex1df4) Binding 0
+                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 42(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 47(g_sSamp) DescriptorSet 0
                               Decorate 47(g_sSamp) Binding 0
+                              Decorate 47(g_sSamp) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
index 7af13b23..01e99844 100644
--- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
@@ -791,46 +791,47 @@ using depth_any
                               MemberName 229($Global) 6  "o3"
                               MemberName 229($Global) 7  "o4"
                               Name 231  ""
-                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 17(g_tTex1df4) Binding 0
-                              Decorate 26(g_tTex1di4) DescriptorSet 0
+                              Decorate 17(g_tTex1df4) DescriptorSet 0
                               Decorate 26(g_tTex1di4) Binding 1
-                              Decorate 33(g_tTex1du4) DescriptorSet 0
+                              Decorate 26(g_tTex1di4) DescriptorSet 0
                               Decorate 33(g_tTex1du4) Binding 2
-                              Decorate 40(g_tBuffF) DescriptorSet 0
+                              Decorate 33(g_tTex1du4) DescriptorSet 0
                               Decorate 40(g_tBuffF) Binding 15
-                              Decorate 47(g_tBuffI) DescriptorSet 0
+                              Decorate 40(g_tBuffF) DescriptorSet 0
                               Decorate 47(g_tBuffI) Binding 16
-                              Decorate 54(g_tBuffU) DescriptorSet 0
+                              Decorate 47(g_tBuffI) DescriptorSet 0
                               Decorate 54(g_tBuffU) Binding 17
-                              Decorate 63(g_tTex1df4a) DescriptorSet 0
+                              Decorate 54(g_tBuffU) DescriptorSet 0
                               Decorate 63(g_tTex1df4a) Binding 9
-                              Decorate 76(g_tTex1di4a) DescriptorSet 0
+                              Decorate 63(g_tTex1df4a) DescriptorSet 0
                               Decorate 76(g_tTex1di4a) Binding 10
-                              Decorate 86(g_tTex1du4a) DescriptorSet 0
+                              Decorate 76(g_tTex1di4a) DescriptorSet 0
                               Decorate 86(g_tTex1du4a) Binding 11
-                              Decorate 96(g_tTex2df4) DescriptorSet 0
+                              Decorate 86(g_tTex1du4a) DescriptorSet 0
                               Decorate 96(g_tTex2df4) Binding 3
-                              Decorate 107(g_tTex2di4) DescriptorSet 0
+                              Decorate 96(g_tTex2df4) DescriptorSet 0
                               Decorate 107(g_tTex2di4) Binding 4
-                              Decorate 117(g_tTex2du4) DescriptorSet 0
+                              Decorate 107(g_tTex2di4) DescriptorSet 0
                               Decorate 117(g_tTex2du4) Binding 5
-                              Decorate 129(g_tTex2df4a) DescriptorSet 0
+                              Decorate 117(g_tTex2du4) DescriptorSet 0
                               Decorate 129(g_tTex2df4a) Binding 12
-                              Decorate 142(g_tTex2di4a) DescriptorSet 0
+                              Decorate 129(g_tTex2df4a) DescriptorSet 0
                               Decorate 142(g_tTex2di4a) Binding 13
-                              Decorate 154(g_tTex2du4a) DescriptorSet 0
+                              Decorate 142(g_tTex2di4a) DescriptorSet 0
                               Decorate 154(g_tTex2du4a) Binding 14
-                              Decorate 166(g_tTex3df4) DescriptorSet 0
+                              Decorate 154(g_tTex2du4a) DescriptorSet 0
                               Decorate 166(g_tTex3df4) Binding 6
-                              Decorate 179(g_tTex3di4) DescriptorSet 0
+                              Decorate 166(g_tTex3df4) DescriptorSet 0
                               Decorate 179(g_tTex3di4) Binding 7
-                              Decorate 191(g_tTex3du4) DescriptorSet 0
+                              Decorate 179(g_tTex3di4) DescriptorSet 0
                               Decorate 191(g_tTex3du4) Binding 8
+                              Decorate 191(g_tTex3du4) DescriptorSet 0
                               Decorate 216(@entryPointOutput.Color) Location 0
                               Decorate 220(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 225(g_sSamp) DescriptorSet 0
                               Decorate 225(g_sSamp) Binding 0
+                              Decorate 225(g_sSamp) DescriptorSet 0
+                              Decorate 229($Global) Block
                               MemberDecorate 229($Global) 0 Offset 0
                               MemberDecorate 229($Global) 1 Offset 8
                               MemberDecorate 229($Global) 2 Offset 16
@@ -839,9 +840,8 @@ using depth_any
                               MemberDecorate 229($Global) 5 Offset 56
                               MemberDecorate 229($Global) 6 Offset 64
                               MemberDecorate 229($Global) 7 Offset 80
-                              Decorate 229($Global) Block
-                              Decorate 231 DescriptorSet 0
                               Decorate 231 Binding 0
+                              Decorate 231 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
index f08a91cd..c2b97094 100644
--- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
+++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
@@ -619,16 +619,16 @@ using depth_any
                               Name 188  "@entryPointOutput.Color"
                               Name 192  "@entryPointOutput.Depth"
                               Name 197  "g_sSamp"
-                              Decorate 23(g_tTex2dmsf4) DescriptorSet 0
                               Decorate 23(g_tTex2dmsf4) Binding 1
-                              Decorate 131(g_tTex2dmsf4a) DescriptorSet 0
+                              Decorate 23(g_tTex2dmsf4) DescriptorSet 0
                               Decorate 131(g_tTex2dmsf4a) Binding 2
+                              Decorate 131(g_tTex2dmsf4a) DescriptorSet 0
                               Decorate 181(sample) Flat
                               Decorate 181(sample) Location 0
                               Decorate 188(@entryPointOutput.Color) Location 0
                               Decorate 192(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 197(g_sSamp) DescriptorSet 0
                               Decorate 197(g_sSamp) Binding 0
+                              Decorate 197(g_sSamp) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.global-const-init.frag.out b/Test/baseResults/hlsl.global-const-init.frag.out
index 0510b3e8..4b9d98e7 100644
--- a/Test/baseResults/hlsl.global-const-init.frag.out
+++ b/Test/baseResults/hlsl.global-const-init.frag.out
@@ -119,10 +119,10 @@ gl_FragCoord origin is upper left
                               Name 15  ""
                               Name 26  "a1"
                               Name 41  "@entryPointOutput"
-                              MemberDecorate 13(CB) 0 Offset 0
                               Decorate 13(CB) Block
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13(CB) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               Decorate 41(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.groupid.comp.out b/Test/baseResults/hlsl.groupid.comp.out
index 39c5fede..ba1eb136 100644
--- a/Test/baseResults/hlsl.groupid.comp.out
+++ b/Test/baseResults/hlsl.groupid.comp.out
@@ -99,8 +99,8 @@ local_size = (8, 8, 1)
                               Name 26  "vGroupId"
                               Name 29  "vGroupId"
                               Name 34  "param"
-                              Decorate 22(OutputTexture) DescriptorSet 0
                               Decorate 22(OutputTexture) Binding 0
+                              Decorate 22(OutputTexture) DescriptorSet 0
                               Decorate 29(vGroupId) BuiltIn WorkgroupId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.gs-hs-mix.tesc.out b/Test/baseResults/hlsl.gs-hs-mix.tesc.out
index 5071a474..8dcbe4db 100644
--- a/Test/baseResults/hlsl.gs-hs-mix.tesc.out
+++ b/Test/baseResults/hlsl.gs-hs-mix.tesc.out
@@ -1057,32 +1057,32 @@ triangle order = ccw
                               Name 204  "Q1"
                               Name 213  "Q2"
                               Name 222  "vertex"
+                              Decorate 42(UniformBlock0) Block
                               MemberDecorate 42(UniformBlock0) 0 RowMajor
-                              MemberDecorate 42(UniformBlock0) 0 Offset 0
                               MemberDecorate 42(UniformBlock0) 0 MatrixStride 16
+                              MemberDecorate 42(UniformBlock0) 0 Offset 0
                               MemberDecorate 42(UniformBlock0) 1 RowMajor
-                              MemberDecorate 42(UniformBlock0) 1 Offset 64
                               MemberDecorate 42(UniformBlock0) 1 MatrixStride 16
+                              MemberDecorate 42(UniformBlock0) 1 Offset 64
                               MemberDecorate 42(UniformBlock0) 2 RowMajor
-                              MemberDecorate 42(UniformBlock0) 2 Offset 128
                               MemberDecorate 42(UniformBlock0) 2 MatrixStride 16
+                              MemberDecorate 42(UniformBlock0) 2 Offset 128
                               MemberDecorate 42(UniformBlock0) 3 RowMajor
-                              MemberDecorate 42(UniformBlock0) 3 Offset 192
                               MemberDecorate 42(UniformBlock0) 3 MatrixStride 16
+                              MemberDecorate 42(UniformBlock0) 3 Offset 192
                               MemberDecorate 42(UniformBlock0) 4 Offset 240
                               MemberDecorate 42(UniformBlock0) 5 Offset 256
                               MemberDecorate 42(UniformBlock0) 6 Offset 272
-                              Decorate 42(UniformBlock0) Block
-                              Decorate 44 DescriptorSet 0
                               Decorate 44 Binding 0
+                              Decorate 44 DescriptorSet 0
                               Decorate 97(patch.PositionWS) Location 0
                               Decorate 102(patch.NormalWS) Location 1
                               Decorate 120(id) BuiltIn InvocationId
                               Decorate 123(@entryPointOutput.PositionWS) Location 0
-                              Decorate 145(@patchConstantOutput.EdgeTessFactor) Patch
                               Decorate 145(@patchConstantOutput.EdgeTessFactor) BuiltIn TessLevelOuter
-                              Decorate 158(@patchConstantOutput.InsideTessFactor) Patch
+                              Decorate 145(@patchConstantOutput.EdgeTessFactor) Patch
                               Decorate 158(@patchConstantOutput.InsideTessFactor) BuiltIn TessLevelInner
+                              Decorate 158(@patchConstantOutput.InsideTessFactor) Patch
                               Decorate 162(@patchConstantOutput.NormalWS[0]) Patch
                               Decorate 162(@patchConstantOutput.NormalWS[0]) Location 1
                               Decorate 165(@patchConstantOutput.NormalWS[1]) Patch
diff --git a/Test/baseResults/hlsl.hlslOffset.vert.out b/Test/baseResults/hlsl.hlslOffset.vert.out
index 0f7b09bf..d4b90dbf 100644
--- a/Test/baseResults/hlsl.hlslOffset.vert.out
+++ b/Test/baseResults/hlsl.hlslOffset.vert.out
@@ -50,6 +50,7 @@ Shader version: 500
                               MemberName 15(b) 10  "m96"
                               Name 17  ""
                               Decorate 14 ArrayStride 16
+                              Decorate 15(b) Block
                               MemberDecorate 15(b) 0 Offset 0
                               MemberDecorate 15(b) 1 Offset 4
                               MemberDecorate 15(b) 2 Offset 16
@@ -61,9 +62,8 @@ Shader version: 500
                               MemberDecorate 15(b) 8 Offset 76
                               MemberDecorate 15(b) 9 Offset 80
                               MemberDecorate 15(b) 10 Offset 96
-                              Decorate 15(b) Block
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
+                              Decorate 17 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                9:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.1.tesc.out b/Test/baseResults/hlsl.hull.1.tesc.out
index 41889420..6914456d 100644
--- a/Test/baseResults/hlsl.hull.1.tesc.out
+++ b/Test/baseResults/hlsl.hull.1.tesc.out
@@ -364,8 +364,8 @@ vertex spacing = equal_spacing
                               Decorate 60(m_cpid) BuiltIn InvocationId
                               Decorate 63(@entryPointOutput.cpoint) Location 0
                               Decorate 81(pid) BuiltIn PrimitiveId
-                              Decorate 87(@patchConstantOutput.edges) Patch
                               Decorate 87(@patchConstantOutput.edges) BuiltIn TessLevelOuter
+                              Decorate 87(@patchConstantOutput.edges) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.2.tesc.out b/Test/baseResults/hlsl.hull.2.tesc.out
index 0d08b681..1a117359 100644
--- a/Test/baseResults/hlsl.hull.2.tesc.out
+++ b/Test/baseResults/hlsl.hull.2.tesc.out
@@ -361,8 +361,8 @@ vertex spacing = equal_spacing
                               Decorate 63(InvocationId) BuiltIn InvocationId
                               Decorate 79(pid) BuiltIn PrimitiveId
                               Decorate 81(pos) BuiltIn Position
-                              Decorate 89(@patchConstantOutput.edges) Patch
                               Decorate 89(@patchConstantOutput.edges) BuiltIn TessLevelOuter
+                              Decorate 89(@patchConstantOutput.edges) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.3.tesc.out b/Test/baseResults/hlsl.hull.3.tesc.out
index 808edd3a..4e0bf678 100644
--- a/Test/baseResults/hlsl.hull.3.tesc.out
+++ b/Test/baseResults/hlsl.hull.3.tesc.out
@@ -362,8 +362,8 @@ vertex spacing = equal_spacing
                               Decorate 63(InvocationId) BuiltIn InvocationId
                               Decorate 79(pid) BuiltIn PrimitiveId
                               Decorate 81(pos) BuiltIn Position
-                              Decorate 89(@patchConstantOutput.edges) Patch
                               Decorate 89(@patchConstantOutput.edges) BuiltIn TessLevelOuter
+                              Decorate 89(@patchConstantOutput.edges) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.4.tesc.out b/Test/baseResults/hlsl.hull.4.tesc.out
index bffc4646..343844b9 100644
--- a/Test/baseResults/hlsl.hull.4.tesc.out
+++ b/Test/baseResults/hlsl.hull.4.tesc.out
@@ -502,10 +502,10 @@ triangle order = cw
                               Decorate 61(I.m_Normal) Location 0
                               Decorate 80(cpid) BuiltIn InvocationId
                               Decorate 83(@entryPointOutput.m_Position) BuiltIn Position
-                              Decorate 107(@patchConstantOutput.fTessFactor) Patch
                               Decorate 107(@patchConstantOutput.fTessFactor) BuiltIn TessLevelOuter
-                              Decorate 120(@patchConstantOutput.fInsideTessFactor) Patch
+                              Decorate 107(@patchConstantOutput.fTessFactor) Patch
                               Decorate 120(@patchConstantOutput.fInsideTessFactor) BuiltIn TessLevelInner
+                              Decorate 120(@patchConstantOutput.fInsideTessFactor) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.6.tesc.out b/Test/baseResults/hlsl.hull.6.tesc.out
index b673a8c5..8522e94b 100644
--- a/Test/baseResults/hlsl.hull.6.tesc.out
+++ b/Test/baseResults/hlsl.hull.6.tesc.out
@@ -503,10 +503,10 @@ triangle order = ccw
                               Decorate 97(@entryPointOutput.Position) Location 0
                               Decorate 104(@entryPointOutput.Color) Location 1
                               Decorate 117(BlockID) BuiltIn PrimitiveId
-                              Decorate 119(Inside) Patch
                               Decorate 119(Inside) BuiltIn TessLevelInner
-                              Decorate 128(@patchConstantOutput.Edges) Patch
+                              Decorate 119(Inside) Patch
                               Decorate 128(@patchConstantOutput.Edges) BuiltIn TessLevelOuter
+                              Decorate 128(@patchConstantOutput.Edges) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
index 4e706c0f..38927652 100644
--- a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
+++ b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
@@ -522,10 +522,10 @@ triangle order = cw
                               Decorate 42(i.val) Location 0
                               Decorate 57(cpid) BuiltIn InvocationId
                               Decorate 60(@entryPointOutput.val) Location 0
-                              Decorate 105(@patchConstantOutput.tfactor) Patch
                               Decorate 105(@patchConstantOutput.tfactor) BuiltIn TessLevelOuter
-                              Decorate 119(@patchConstantOutput.flInFactor) Patch
+                              Decorate 105(@patchConstantOutput.tfactor) Patch
                               Decorate 119(@patchConstantOutput.flInFactor) BuiltIn TessLevelInner
+                              Decorate 119(@patchConstantOutput.flInFactor) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
index fd7cf0b6..a1894468 100644
--- a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
+++ b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
@@ -541,10 +541,10 @@ triangle order = cw
                               Decorate 43(i.val) Location 0
                               Decorate 58(cpid) BuiltIn InvocationId
                               Decorate 61(@entryPointOutput.val) Location 0
-                              Decorate 107(@patchConstantOutput.tfactor) Patch
                               Decorate 107(@patchConstantOutput.tfactor) BuiltIn TessLevelOuter
-                              Decorate 121(@patchConstantOutput.flInFactor) Patch
+                              Decorate 107(@patchConstantOutput.tfactor) Patch
                               Decorate 121(@patchConstantOutput.flInFactor) BuiltIn TessLevelInner
+                              Decorate 121(@patchConstantOutput.flInFactor) Patch
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.imagefetch-subvec4.comp.out b/Test/baseResults/hlsl.imagefetch-subvec4.comp.out
index 6573820d..83f04cfc 100644
--- a/Test/baseResults/hlsl.imagefetch-subvec4.comp.out
+++ b/Test/baseResults/hlsl.imagefetch-subvec4.comp.out
@@ -444,36 +444,36 @@ local_size = (8, 8, 8)
                               Name 179  "tid"
                               Name 181  "tid"
                               Name 183  "param"
-                              Decorate 19(i1D) DescriptorSet 0
                               Decorate 19(i1D) Binding 0
-                              Decorate 34(i2D) DescriptorSet 0
+                              Decorate 19(i1D) DescriptorSet 0
                               Decorate 34(i2D) Binding 1
-                              Decorate 45(i3D) DescriptorSet 0
+                              Decorate 34(i2D) DescriptorSet 0
                               Decorate 45(i3D) Binding 2
-                              Decorate 54(i1DArray) DescriptorSet 0
+                              Decorate 45(i3D) DescriptorSet 0
                               Decorate 54(i1DArray) Binding 3
-                              Decorate 64(i2DArray) DescriptorSet 0
+                              Decorate 54(i1DArray) DescriptorSet 0
                               Decorate 64(i2DArray) Binding 4
-                              Decorate 73(i2DMS) DescriptorSet 0
+                              Decorate 64(i2DArray) DescriptorSet 0
                               Decorate 73(i2DMS) Binding 5
-                              Decorate 86(i2DMSArray) DescriptorSet 0
+                              Decorate 73(i2DMS) DescriptorSet 0
                               Decorate 86(i2DMSArray) Binding 6
-                              Decorate 100(ii1D) DescriptorSet 0
+                              Decorate 86(i2DMSArray) DescriptorSet 0
                               Decorate 100(ii1D) Binding 7
-                              Decorate 111(ii2D) DescriptorSet 0
+                              Decorate 100(ii1D) DescriptorSet 0
                               Decorate 111(ii2D) Binding 8
-                              Decorate 121(ii3D) DescriptorSet 0
+                              Decorate 111(ii2D) DescriptorSet 0
                               Decorate 121(ii3D) Binding 9
-                              Decorate 130(ii1DArray) DescriptorSet 0
+                              Decorate 121(ii3D) DescriptorSet 0
                               Decorate 130(ii1DArray) Binding 10
-                              Decorate 140(ii2DArray) DescriptorSet 0
+                              Decorate 130(ii1DArray) DescriptorSet 0
                               Decorate 140(ii2DArray) Binding 11
-                              Decorate 149(ii2DMS) DescriptorSet 0
+                              Decorate 140(ii2DArray) DescriptorSet 0
                               Decorate 149(ii2DMS) Binding 12
-                              Decorate 160(ii2DMSArray) DescriptorSet 0
+                              Decorate 149(ii2DMS) DescriptorSet 0
                               Decorate 160(ii2DMSArray) Binding 13
-                              Decorate 175(OUT) DescriptorSet 0
+                              Decorate 160(ii2DMSArray) DescriptorSet 0
                               Decorate 175(OUT) Binding 0
+                              Decorate 175(OUT) DescriptorSet 0
                               Decorate 181(tid) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.imageload-subvec4.comp.out b/Test/baseResults/hlsl.imageload-subvec4.comp.out
index d54075f1..e1714172 100644
--- a/Test/baseResults/hlsl.imageload-subvec4.comp.out
+++ b/Test/baseResults/hlsl.imageload-subvec4.comp.out
@@ -296,28 +296,28 @@ local_size = (8, 8, 8)
                               Name 131  "tid"
                               Name 133  "tid"
                               Name 135  "param"
-                              Decorate 19(i1D) DescriptorSet 0
                               Decorate 19(i1D) Binding 0
-                              Decorate 32(i2D) DescriptorSet 0
+                              Decorate 19(i1D) DescriptorSet 0
                               Decorate 32(i2D) Binding 1
-                              Decorate 43(i3D) DescriptorSet 0
+                              Decorate 32(i2D) DescriptorSet 0
                               Decorate 43(i3D) Binding 2
-                              Decorate 52(i1DArray) DescriptorSet 0
+                              Decorate 43(i3D) DescriptorSet 0
                               Decorate 52(i1DArray) Binding 3
-                              Decorate 62(i2DArray) DescriptorSet 0
+                              Decorate 52(i1DArray) DescriptorSet 0
                               Decorate 62(i2DArray) Binding 4
-                              Decorate 75(ii1D) DescriptorSet 0
+                              Decorate 62(i2DArray) DescriptorSet 0
                               Decorate 75(ii1D) Binding 5
-                              Decorate 86(ii2D) DescriptorSet 0
+                              Decorate 75(ii1D) DescriptorSet 0
                               Decorate 86(ii2D) Binding 6
-                              Decorate 96(ii3D) DescriptorSet 0
+                              Decorate 86(ii2D) DescriptorSet 0
                               Decorate 96(ii3D) Binding 7
-                              Decorate 105(ii1DArray) DescriptorSet 0
+                              Decorate 96(ii3D) DescriptorSet 0
                               Decorate 105(ii1DArray) Binding 8
-                              Decorate 115(ii2DArray) DescriptorSet 0
+                              Decorate 105(ii1DArray) DescriptorSet 0
                               Decorate 115(ii2DArray) Binding 9
-                              Decorate 127(OUT) DescriptorSet 0
+                              Decorate 115(ii2DArray) DescriptorSet 0
                               Decorate 127(OUT) Binding 10
+                              Decorate 127(OUT) DescriptorSet 0
                               Decorate 133(tid) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.implicitBool.frag.out b/Test/baseResults/hlsl.implicitBool.frag.out
index 381e835c..03d04876 100644
--- a/Test/baseResults/hlsl.implicitBool.frag.out
+++ b/Test/baseResults/hlsl.implicitBool.frag.out
@@ -354,13 +354,13 @@ gl_FragCoord origin is upper left
                               Name 100  "i"
                               Name 120  "g"
                               Name 137  "@entryPointOutput"
+                              Decorate 16($Global) Block
                               MemberDecorate 16($Global) 0 Offset 0
                               MemberDecorate 16($Global) 1 Offset 4
                               MemberDecorate 16($Global) 2 Offset 8
                               MemberDecorate 16($Global) 3 Offset 12
-                              Decorate 16($Global) Block
-                              Decorate 18 DescriptorSet 0
                               Decorate 18 Binding 0
+                              Decorate 18 DescriptorSet 0
                               Decorate 137(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.include.vert.out b/Test/baseResults/hlsl.include.vert.out
index 95a5b906..d2e147bd 100644
--- a/Test/baseResults/hlsl.include.vert.out
+++ b/Test/baseResults/hlsl.include.vert.out
@@ -19,15 +19,15 @@
                               MemberName 11($Global) 5  "i5"
                               Name 13  ""
                               Name 42  "@entryPointOutput"
+                              Decorate 11($Global) Block
                               MemberDecorate 11($Global) 0 Offset 0
                               MemberDecorate 11($Global) 1 Offset 16
                               MemberDecorate 11($Global) 2 Offset 32
                               MemberDecorate 11($Global) 3 Offset 48
                               MemberDecorate 11($Global) 4 Offset 64
                               MemberDecorate 11($Global) 5 Offset 80
-                              Decorate 11($Global) Block
-                              Decorate 13 DescriptorSet 0
                               Decorate 13 Binding 0
+                              Decorate 13 DescriptorSet 0
                               Decorate 42(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out
index 35a89f04..89b1a74f 100644
--- a/Test/baseResults/hlsl.init.frag.out
+++ b/Test/baseResults/hlsl.init.frag.out
@@ -392,12 +392,12 @@ gl_FragCoord origin is upper left
                               Name 109  ""
                               Decorate 98(input) Location 0
                               Decorate 101(@entryPointOutput) Location 0
+                              Decorate 107(Constants) Block
                               MemberDecorate 107(Constants) 0 Offset 0
                               MemberDecorate 107(Constants) 1 Offset 4
                               MemberDecorate 107(Constants) 2 Offset 8
-                              Decorate 107(Constants) Block
-                              Decorate 109 DescriptorSet 0
                               Decorate 109 Binding 0
+                              Decorate 109 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out
index 931208b9..acea80bf 100644
--- a/Test/baseResults/hlsl.inoutquals.frag.out
+++ b/Test/baseResults/hlsl.inoutquals.frag.out
@@ -253,8 +253,8 @@ using depth_any
                               Name 78  "@entryPointOutput.Color"
                               Name 82  "@entryPointOutput.Depth"
                               Name 88  "sampleMask"
-                              Decorate 68(inpos) NoPerspective
                               Decorate 68(inpos) BuiltIn FragCoord
+                              Decorate 68(inpos) NoPerspective
                               Decorate 78(@entryPointOutput.Color) Location 0
                               Decorate 82(@entryPointOutput.Depth) BuiltIn FragDepth
                               Decorate 88(sampleMask) BuiltIn SampleMask
diff --git a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
index 75a66d6f..69416c37 100644
--- a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
@@ -89,10 +89,10 @@ gl_FragCoord origin is upper left
                               MemberName 14($Global) 0  "col4"
                               Name 16  ""
                               Name 27  "@entryPointOutput"
-                              MemberDecorate 14($Global) 0 Offset 0
                               Decorate 14($Global) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14($Global) 0 Offset 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 27(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
index c68fc960..592bb887 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
@@ -131,6 +131,7 @@ gl_FragCoord origin is upper left
                               Name 29  "r01"
                               Name 37  "ps_output"
                               Name 47  "@entryPointOutput.color"
+                              Decorate 19($Global) Block
                               MemberDecorate 19($Global) 0 Offset 0
                               MemberDecorate 19($Global) 1 Offset 4
                               MemberDecorate 19($Global) 2 Offset 8
@@ -139,9 +140,8 @@ gl_FragCoord origin is upper left
                               MemberDecorate 19($Global) 5 Offset 24
                               MemberDecorate 19($Global) 6 Offset 32
                               MemberDecorate 19($Global) 7 Offset 40
-                              Decorate 19($Global) Block
-                              Decorate 21 DescriptorSet 0
                               Decorate 21 Binding 0
+                              Decorate 21 DescriptorSet 0
                               Decorate 47(@entryPointOutput.color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.intrinsics.promote.frag.out b/Test/baseResults/hlsl.intrinsics.promote.frag.out
index 99176f1a..e0a1c7d9 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.frag.out
@@ -952,6 +952,7 @@ gl_FragCoord origin is upper left
                               Name 301  "sizeQueryTemp"
                               Name 310  "ps_output"
                               Name 319  "@entryPointOutput.color"
+                              Decorate 19($Global) Block
                               MemberDecorate 19($Global) 0 Offset 0
                               MemberDecorate 19($Global) 1 Offset 4
                               MemberDecorate 19($Global) 2 Offset 8
@@ -962,13 +963,12 @@ gl_FragCoord origin is upper left
                               MemberDecorate 19($Global) 7 Offset 40
                               MemberDecorate 19($Global) 8 Offset 48
                               MemberDecorate 19($Global) 9 Offset 52
-                              Decorate 19($Global) Block
-                              Decorate 21 DescriptorSet 0
                               Decorate 21 Binding 0
-                              Decorate 258(g_tTexbfs) DescriptorSet 0
+                              Decorate 21 DescriptorSet 0
                               Decorate 258(g_tTexbfs) Binding 1
-                              Decorate 277(g_tTex1df4) DescriptorSet 0
+                              Decorate 258(g_tTexbfs) DescriptorSet 0
                               Decorate 277(g_tTex1df4) Binding 2
+                              Decorate 277(g_tTex1df4) DescriptorSet 0
                               Decorate 319(@entryPointOutput.color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
index e0fbfe6d..48d4cc8b 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
@@ -244,6 +244,7 @@ gl_FragCoord origin is upper left
                               Name 66  "ps_output"
                               Name 74  "@entryPointOutput.color"
                               Name 79  "g_tTexbfs"
+                              Decorate 17($Global) Block
                               MemberDecorate 17($Global) 0 Offset 0
                               MemberDecorate 17($Global) 1 Offset 4
                               MemberDecorate 17($Global) 2 Offset 8
@@ -254,14 +255,13 @@ gl_FragCoord origin is upper left
                               MemberDecorate 17($Global) 7 Offset 40
                               MemberDecorate 17($Global) 8 Offset 48
                               MemberDecorate 17($Global) 9 Offset 52
-                              Decorate 17($Global) Block
-                              Decorate 19 DescriptorSet 0
                               Decorate 19 Binding 0
-                              Decorate 31(g_tTex1df4) DescriptorSet 0
+                              Decorate 19 DescriptorSet 0
                               Decorate 31(g_tTex1df4) Binding 1
+                              Decorate 31(g_tTex1df4) DescriptorSet 0
                               Decorate 74(@entryPointOutput.color) Location 0
-                              Decorate 79(g_tTexbfs) DescriptorSet 0
                               Decorate 79(g_tTexbfs) Binding 0
+                              Decorate 79(g_tTexbfs) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.isfinite.frag.out b/Test/baseResults/hlsl.isfinite.frag.out
index e46e7718..9f562e3b 100644
--- a/Test/baseResults/hlsl.isfinite.frag.out
+++ b/Test/baseResults/hlsl.isfinite.frag.out
@@ -195,12 +195,12 @@ gl_FragCoord origin is upper left
                               Name 51  "@finitetmp"
                               Name 65  "@finitetmp"
                               Name 83  "@entryPointOutput"
+                              Decorate 35($Global) Block
                               MemberDecorate 35($Global) 0 Offset 0
                               MemberDecorate 35($Global) 1 Offset 8
                               MemberDecorate 35($Global) 2 Offset 16
-                              Decorate 35($Global) Block
-                              Decorate 37 DescriptorSet 0
                               Decorate 37 Binding 0
+                              Decorate 37 DescriptorSet 0
                               Decorate 83(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.layout.frag.out b/Test/baseResults/hlsl.layout.frag.out
index b2306d07..564de6d0 100644
--- a/Test/baseResults/hlsl.layout.frag.out
+++ b/Test/baseResults/hlsl.layout.frag.out
@@ -111,19 +111,19 @@ Validation failed
                               MemberName 33(tbufName2) 0  "v1PostLayout"
                               Name 35  ""
                               Name 43  "specConst"
+                              Decorate 17(tbufName) BufferBlock
                               MemberDecorate 17(tbufName) 0 NonWritable
                               MemberDecorate 17(tbufName) 0 Offset 16
-                              Decorate 17(tbufName) BufferBlock
-                              Decorate 19 DescriptorSet 3
                               Decorate 19 Binding 5
+                              Decorate 19 DescriptorSet 3
+                              Decorate 26(tbufName2) BufferBlock
                               MemberDecorate 26(tbufName2) 0 NonWritable
                               MemberDecorate 26(tbufName2) 0 Offset 0
-                              Decorate 26(tbufName2) BufferBlock
+                              Decorate 33(tbufName2) BufferBlock
                               MemberDecorate 33(tbufName2) 0 NonWritable
                               MemberDecorate 33(tbufName2) 0 Offset 16
-                              Decorate 33(tbufName2) BufferBlock
-                              Decorate 35 DescriptorSet 4
                               Decorate 35 Binding 7
+                              Decorate 35 DescriptorSet 4
                               Decorate 43(specConst) SpecId 17
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.layoutOverride.vert.out b/Test/baseResults/hlsl.layoutOverride.vert.out
index 80c3e456..a0d8ad84 100644
--- a/Test/baseResults/hlsl.layoutOverride.vert.out
+++ b/Test/baseResults/hlsl.layoutOverride.vert.out
@@ -65,10 +65,10 @@ Shader version: 500
                               Name 13  "tex"
                               Name 17  "samp"
                               Name 30  "@entryPointOutput"
-                              Decorate 13(tex) DescriptorSet 2
                               Decorate 13(tex) Binding 0
-                              Decorate 17(samp) DescriptorSet 0
+                              Decorate 13(tex) DescriptorSet 2
                               Decorate 17(samp) Binding 0
+                              Decorate 17(samp) DescriptorSet 0
                               Decorate 30(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
index 09086cbc..f8ede047 100644
--- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
@@ -370,29 +370,29 @@ using depth_any
                               Name 119  "@entryPointOutput.Color"
                               Name 123  "@entryPointOutput.Depth"
                               Name 128  "g_sSamp"
-                              Decorate 23(g_tTex2dmsf4) DescriptorSet 0
                               Decorate 23(g_tTex2dmsf4) Binding 1
+                              Decorate 23(g_tTex2dmsf4) DescriptorSet 0
+                              Decorate 27($Global) Block
                               MemberDecorate 27($Global) 0 Offset 0
                               MemberDecorate 27($Global) 1 Offset 8
                               MemberDecorate 27($Global) 2 Offset 16
                               MemberDecorate 27($Global) 3 Offset 32
-                              Decorate 27($Global) Block
-                              Decorate 29 DescriptorSet 0
                               Decorate 29 Binding 7
-                              Decorate 37(g_tTex2dmsi4) DescriptorSet 0
+                              Decorate 29 DescriptorSet 0
                               Decorate 37(g_tTex2dmsi4) Binding 2
-                              Decorate 45(g_tTex2dmsu4) DescriptorSet 0
+                              Decorate 37(g_tTex2dmsi4) DescriptorSet 0
                               Decorate 45(g_tTex2dmsu4) Binding 3
-                              Decorate 68(g_tTex2dmsf4a) DescriptorSet 0
+                              Decorate 45(g_tTex2dmsu4) DescriptorSet 0
                               Decorate 68(g_tTex2dmsf4a) Binding 4
-                              Decorate 77(g_tTex2dmsi4a) DescriptorSet 0
+                              Decorate 68(g_tTex2dmsf4a) DescriptorSet 0
                               Decorate 77(g_tTex2dmsi4a) Binding 5
-                              Decorate 84(g_tTex2dmsu4a) DescriptorSet 0
+                              Decorate 77(g_tTex2dmsi4a) DescriptorSet 0
                               Decorate 84(g_tTex2dmsu4a) Binding 6
+                              Decorate 84(g_tTex2dmsu4a) DescriptorSet 0
                               Decorate 119(@entryPointOutput.Color) Location 0
                               Decorate 123(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 128(g_sSamp) DescriptorSet 0
                               Decorate 128(g_sSamp) Binding 0
+                              Decorate 128(g_sSamp) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out
index 96792a95..4bc42a6b 100644
--- a/Test/baseResults/hlsl.load.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.array.dx10.frag.out
@@ -441,8 +441,9 @@ using depth_any
                               Name 152  "g_tTexcdf4a"
                               Name 155  "g_tTexcdi4a"
                               Name 158  "g_tTexcdu4a"
-                              Decorate 14(g_tTex1df4a) DescriptorSet 0
                               Decorate 14(g_tTex1df4a) Binding 1
+                              Decorate 14(g_tTex1df4a) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -451,53 +452,52 @@ using depth_any
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 7
-                              Decorate 36(g_tTex1di4a) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 36(g_tTex1di4a) Binding 2
-                              Decorate 46(g_tTex1du4a) DescriptorSet 0
+                              Decorate 36(g_tTex1di4a) DescriptorSet 0
                               Decorate 46(g_tTex1du4a) Binding 3
-                              Decorate 57(g_tTex2df4a) DescriptorSet 0
+                              Decorate 46(g_tTex1du4a) DescriptorSet 0
                               Decorate 57(g_tTex2df4a) Binding 4
-                              Decorate 70(g_tTex2di4a) DescriptorSet 0
+                              Decorate 57(g_tTex2df4a) DescriptorSet 0
                               Decorate 70(g_tTex2di4a) Binding 5
-                              Decorate 80(g_tTex2du4a) DescriptorSet 0
+                              Decorate 70(g_tTex2di4a) DescriptorSet 0
                               Decorate 80(g_tTex2du4a) Binding 6
+                              Decorate 80(g_tTex2du4a) DescriptorSet 0
                               Decorate 104(@entryPointOutput.Color) Location 0
                               Decorate 108(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 113(g_sSamp) DescriptorSet 0
                               Decorate 113(g_sSamp) Binding 0
-                              Decorate 116(g_tTex1df4) DescriptorSet 0
+                              Decorate 113(g_sSamp) DescriptorSet 0
                               Decorate 116(g_tTex1df4) Binding 0
-                              Decorate 119(g_tTex1di4) DescriptorSet 0
+                              Decorate 116(g_tTex1df4) DescriptorSet 0
                               Decorate 119(g_tTex1di4) Binding 0
-                              Decorate 122(g_tTex1du4) DescriptorSet 0
+                              Decorate 119(g_tTex1di4) DescriptorSet 0
                               Decorate 122(g_tTex1du4) Binding 0
-                              Decorate 125(g_tTex2df4) DescriptorSet 0
+                              Decorate 122(g_tTex1du4) DescriptorSet 0
                               Decorate 125(g_tTex2df4) Binding 0
-                              Decorate 128(g_tTex2di4) DescriptorSet 0
+                              Decorate 125(g_tTex2df4) DescriptorSet 0
                               Decorate 128(g_tTex2di4) Binding 0
-                              Decorate 131(g_tTex2du4) DescriptorSet 0
+                              Decorate 128(g_tTex2di4) DescriptorSet 0
                               Decorate 131(g_tTex2du4) Binding 0
-                              Decorate 134(g_tTex3df4) DescriptorSet 0
+                              Decorate 131(g_tTex2du4) DescriptorSet 0
                               Decorate 134(g_tTex3df4) Binding 0
-                              Decorate 137(g_tTex3di4) DescriptorSet 0
+                              Decorate 134(g_tTex3df4) DescriptorSet 0
                               Decorate 137(g_tTex3di4) Binding 0
-                              Decorate 140(g_tTex3du4) DescriptorSet 0
+                              Decorate 137(g_tTex3di4) DescriptorSet 0
                               Decorate 140(g_tTex3du4) Binding 0
-                              Decorate 143(g_tTexcdf4) DescriptorSet 0
+                              Decorate 140(g_tTex3du4) DescriptorSet 0
                               Decorate 143(g_tTexcdf4) Binding 0
-                              Decorate 146(g_tTexcdi4) DescriptorSet 0
+                              Decorate 143(g_tTexcdf4) DescriptorSet 0
                               Decorate 146(g_tTexcdi4) Binding 0
-                              Decorate 149(g_tTexcdu4) DescriptorSet 0
+                              Decorate 146(g_tTexcdi4) DescriptorSet 0
                               Decorate 149(g_tTexcdu4) Binding 0
-                              Decorate 152(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 149(g_tTexcdu4) DescriptorSet 0
                               Decorate 152(g_tTexcdf4a) Binding 0
-                              Decorate 155(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 152(g_tTexcdf4a) DescriptorSet 0
                               Decorate 155(g_tTexcdi4a) Binding 0
-                              Decorate 158(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 155(g_tTexcdi4a) DescriptorSet 0
                               Decorate 158(g_tTexcdu4a) Binding 0
+                              Decorate 158(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out
index b9730f37..d1be427e 100644
--- a/Test/baseResults/hlsl.load.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out
@@ -543,8 +543,9 @@ using depth_any
                               Name 172  "g_tTexcdf4a"
                               Name 175  "g_tTexcdi4a"
                               Name 178  "g_tTexcdu4a"
-                              Decorate 14(g_tTex1df4) DescriptorSet 0
                               Decorate 14(g_tTex1df4) Binding 0
+                              Decorate 14(g_tTex1df4) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -553,53 +554,52 @@ using depth_any
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 9
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 1
-                              Decorate 44(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 44(g_tTex1du4) Binding 2
-                              Decorate 54(g_tTex2df4) DescriptorSet 0
+                              Decorate 44(g_tTex1du4) DescriptorSet 0
                               Decorate 54(g_tTex2df4) Binding 3
-                              Decorate 67(g_tTex2di4) DescriptorSet 0
+                              Decorate 54(g_tTex2df4) DescriptorSet 0
                               Decorate 67(g_tTex2di4) Binding 4
-                              Decorate 77(g_tTex2du4) DescriptorSet 0
+                              Decorate 67(g_tTex2di4) DescriptorSet 0
                               Decorate 77(g_tTex2du4) Binding 5
-                              Decorate 87(g_tTex3df4) DescriptorSet 0
+                              Decorate 77(g_tTex2du4) DescriptorSet 0
                               Decorate 87(g_tTex3df4) Binding 6
-                              Decorate 100(g_tTex3di4) DescriptorSet 0
+                              Decorate 87(g_tTex3df4) DescriptorSet 0
                               Decorate 100(g_tTex3di4) Binding 7
-                              Decorate 110(g_tTex3du4) DescriptorSet 0
+                              Decorate 100(g_tTex3di4) DescriptorSet 0
                               Decorate 110(g_tTex3du4) Binding 8
+                              Decorate 110(g_tTex3du4) DescriptorSet 0
                               Decorate 133(@entryPointOutput.Color) Location 0
                               Decorate 137(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 142(g_sSamp) DescriptorSet 0
                               Decorate 142(g_sSamp) Binding 0
-                              Decorate 145(g_tTexcdf4) DescriptorSet 0
+                              Decorate 142(g_sSamp) DescriptorSet 0
                               Decorate 145(g_tTexcdf4) Binding 0
-                              Decorate 148(g_tTexcdi4) DescriptorSet 0
+                              Decorate 145(g_tTexcdf4) DescriptorSet 0
                               Decorate 148(g_tTexcdi4) Binding 0
-                              Decorate 151(g_tTexcdu4) DescriptorSet 0
+                              Decorate 148(g_tTexcdi4) DescriptorSet 0
                               Decorate 151(g_tTexcdu4) Binding 0
-                              Decorate 154(g_tTex1df4a) DescriptorSet 0
+                              Decorate 151(g_tTexcdu4) DescriptorSet 0
                               Decorate 154(g_tTex1df4a) Binding 0
-                              Decorate 157(g_tTex1di4a) DescriptorSet 0
+                              Decorate 154(g_tTex1df4a) DescriptorSet 0
                               Decorate 157(g_tTex1di4a) Binding 0
-                              Decorate 160(g_tTex1du4a) DescriptorSet 0
+                              Decorate 157(g_tTex1di4a) DescriptorSet 0
                               Decorate 160(g_tTex1du4a) Binding 0
-                              Decorate 163(g_tTex2df4a) DescriptorSet 0
+                              Decorate 160(g_tTex1du4a) DescriptorSet 0
                               Decorate 163(g_tTex2df4a) Binding 0
-                              Decorate 166(g_tTex2di4a) DescriptorSet 0
+                              Decorate 163(g_tTex2df4a) DescriptorSet 0
                               Decorate 166(g_tTex2di4a) Binding 0
-                              Decorate 169(g_tTex2du4a) DescriptorSet 0
+                              Decorate 166(g_tTex2di4a) DescriptorSet 0
                               Decorate 169(g_tTex2du4a) Binding 0
-                              Decorate 172(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 169(g_tTex2du4a) DescriptorSet 0
                               Decorate 172(g_tTexcdf4a) Binding 0
-                              Decorate 175(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 172(g_tTexcdf4a) DescriptorSet 0
                               Decorate 175(g_tTexcdi4a) Binding 0
-                              Decorate 178(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 175(g_tTexcdi4a) DescriptorSet 0
                               Decorate 178(g_tTexcdu4a) Binding 0
+                              Decorate 178(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out
index c387d5f9..1dc4464f 100644
--- a/Test/baseResults/hlsl.load.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out
@@ -500,8 +500,9 @@ Shader version: 500
                               Name 164  "g_tTexcdf4a"
                               Name 167  "g_tTexcdi4a"
                               Name 170  "g_tTexcdu4a"
-                              Decorate 14(g_tTex1df4) DescriptorSet 0
                               Decorate 14(g_tTex1df4) Binding 0
+                              Decorate 14(g_tTex1df4) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -510,52 +511,51 @@ Shader version: 500
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 9
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 1
-                              Decorate 44(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 44(g_tTex1du4) Binding 2
-                              Decorate 54(g_tTex2df4) DescriptorSet 0
+                              Decorate 44(g_tTex1du4) DescriptorSet 0
                               Decorate 54(g_tTex2df4) Binding 3
-                              Decorate 67(g_tTex2di4) DescriptorSet 0
+                              Decorate 54(g_tTex2df4) DescriptorSet 0
                               Decorate 67(g_tTex2di4) Binding 4
-                              Decorate 77(g_tTex2du4) DescriptorSet 0
+                              Decorate 67(g_tTex2di4) DescriptorSet 0
                               Decorate 77(g_tTex2du4) Binding 5
-                              Decorate 87(g_tTex3df4) DescriptorSet 0
+                              Decorate 77(g_tTex2du4) DescriptorSet 0
                               Decorate 87(g_tTex3df4) Binding 6
-                              Decorate 100(g_tTex3di4) DescriptorSet 0
+                              Decorate 87(g_tTex3df4) DescriptorSet 0
                               Decorate 100(g_tTex3di4) Binding 7
-                              Decorate 110(g_tTex3du4) DescriptorSet 0
+                              Decorate 100(g_tTex3di4) DescriptorSet 0
                               Decorate 110(g_tTex3du4) Binding 8
+                              Decorate 110(g_tTex3du4) DescriptorSet 0
                               Decorate 129(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 134(g_sSamp) DescriptorSet 0
                               Decorate 134(g_sSamp) Binding 0
-                              Decorate 137(g_tTexcdf4) DescriptorSet 0
+                              Decorate 134(g_sSamp) DescriptorSet 0
                               Decorate 137(g_tTexcdf4) Binding 0
-                              Decorate 140(g_tTexcdi4) DescriptorSet 0
+                              Decorate 137(g_tTexcdf4) DescriptorSet 0
                               Decorate 140(g_tTexcdi4) Binding 0
-                              Decorate 143(g_tTexcdu4) DescriptorSet 0
+                              Decorate 140(g_tTexcdi4) DescriptorSet 0
                               Decorate 143(g_tTexcdu4) Binding 0
-                              Decorate 146(g_tTex1df4a) DescriptorSet 0
+                              Decorate 143(g_tTexcdu4) DescriptorSet 0
                               Decorate 146(g_tTex1df4a) Binding 0
-                              Decorate 149(g_tTex1di4a) DescriptorSet 0
+                              Decorate 146(g_tTex1df4a) DescriptorSet 0
                               Decorate 149(g_tTex1di4a) Binding 0
-                              Decorate 152(g_tTex1du4a) DescriptorSet 0
+                              Decorate 149(g_tTex1di4a) DescriptorSet 0
                               Decorate 152(g_tTex1du4a) Binding 0
-                              Decorate 155(g_tTex2df4a) DescriptorSet 0
+                              Decorate 152(g_tTex1du4a) DescriptorSet 0
                               Decorate 155(g_tTex2df4a) Binding 0
-                              Decorate 158(g_tTex2di4a) DescriptorSet 0
+                              Decorate 155(g_tTex2df4a) DescriptorSet 0
                               Decorate 158(g_tTex2di4a) Binding 0
-                              Decorate 161(g_tTex2du4a) DescriptorSet 0
+                              Decorate 158(g_tTex2di4a) DescriptorSet 0
                               Decorate 161(g_tTex2du4a) Binding 0
-                              Decorate 164(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 161(g_tTex2du4a) DescriptorSet 0
                               Decorate 164(g_tTexcdf4a) Binding 0
-                              Decorate 167(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 164(g_tTexcdf4a) DescriptorSet 0
                               Decorate 167(g_tTexcdi4a) Binding 0
-                              Decorate 170(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 167(g_tTexcdi4a) DescriptorSet 0
                               Decorate 170(g_tTexcdu4a) Binding 0
+                              Decorate 170(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
index b37e3c93..900c1184 100644
--- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
@@ -203,8 +203,9 @@ using depth_any
                               Name 64  "@entryPointOutput.Color"
                               Name 68  "@entryPointOutput.Depth"
                               Name 71  "g_tTexbf4_test"
-                              Decorate 16(g_tTexbf4) DescriptorSet 0
                               Decorate 16(g_tTexbf4) Binding 1
+                              Decorate 16(g_tTexbf4) DescriptorSet 0
+                              Decorate 22($Global) Block
                               MemberDecorate 22($Global) 0 Offset 0
                               MemberDecorate 22($Global) 1 Offset 8
                               MemberDecorate 22($Global) 2 Offset 16
@@ -213,17 +214,16 @@ using depth_any
                               MemberDecorate 22($Global) 5 Offset 56
                               MemberDecorate 22($Global) 6 Offset 64
                               MemberDecorate 22($Global) 7 Offset 80
-                              Decorate 22($Global) Block
-                              Decorate 24 DescriptorSet 0
                               Decorate 24 Binding 4
-                              Decorate 34(g_tTexbi4) DescriptorSet 0
+                              Decorate 24 DescriptorSet 0
                               Decorate 34(g_tTexbi4) Binding 2
-                              Decorate 45(g_tTexbu4) DescriptorSet 0
+                              Decorate 34(g_tTexbi4) DescriptorSet 0
                               Decorate 45(g_tTexbu4) Binding 3
+                              Decorate 45(g_tTexbu4) DescriptorSet 0
                               Decorate 64(@entryPointOutput.Color) Location 0
                               Decorate 68(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 71(g_tTexbf4_test) DescriptorSet 0
                               Decorate 71(g_tTexbf4_test) Binding 0
+                              Decorate 71(g_tTexbf4_test) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
index b248ed6b..c88fd6a2 100644
--- a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
@@ -209,8 +209,9 @@ using depth_any
                               Name 67  "@entryPointOutput.Color"
                               Name 71  "@entryPointOutput.Depth"
                               Name 74  "g_tTexbfs_test"
-                              Decorate 16(g_tTexbfs) DescriptorSet 0
                               Decorate 16(g_tTexbfs) Binding 1
+                              Decorate 16(g_tTexbfs) DescriptorSet 0
+                              Decorate 22($Global) Block
                               MemberDecorate 22($Global) 0 Offset 0
                               MemberDecorate 22($Global) 1 Offset 8
                               MemberDecorate 22($Global) 2 Offset 16
@@ -219,17 +220,16 @@ using depth_any
                               MemberDecorate 22($Global) 5 Offset 56
                               MemberDecorate 22($Global) 6 Offset 64
                               MemberDecorate 22($Global) 7 Offset 80
-                              Decorate 22($Global) Block
-                              Decorate 24 DescriptorSet 0
                               Decorate 24 Binding 4
-                              Decorate 35(g_tTexbis) DescriptorSet 0
+                              Decorate 24 DescriptorSet 0
                               Decorate 35(g_tTexbis) Binding 2
-                              Decorate 46(g_tTexbus) DescriptorSet 0
+                              Decorate 35(g_tTexbis) DescriptorSet 0
                               Decorate 46(g_tTexbus) Binding 3
+                              Decorate 46(g_tTexbus) DescriptorSet 0
                               Decorate 67(@entryPointOutput.Color) Location 0
                               Decorate 71(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 74(g_tTexbfs_test) DescriptorSet 0
                               Decorate 74(g_tTexbfs_test) Binding 0
+                              Decorate 74(g_tTexbfs_test) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out
index f8d43837..0d07130d 100644
--- a/Test/baseResults/hlsl.load.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out
@@ -603,59 +603,59 @@ using depth_any
                               Name 198  "g_tTexcdf4a"
                               Name 201  "g_tTexcdi4a"
                               Name 204  "g_tTexcdu4a"
-                              Decorate 35(g_tTex1df4) DescriptorSet 0
                               Decorate 35(g_tTex1df4) Binding 0
+                              Decorate 35(g_tTex1df4) DescriptorSet 0
+                              Decorate 38($Global) Block
                               MemberDecorate 38($Global) 0 Offset 0
                               MemberDecorate 38($Global) 1 Offset 8
                               MemberDecorate 38($Global) 2 Offset 16
                               MemberDecorate 38($Global) 3 Offset 32
-                              Decorate 38($Global) Block
-                              Decorate 40 DescriptorSet 0
                               Decorate 40 Binding 9
-                              Decorate 53(g_tTex1di4) DescriptorSet 0
+                              Decorate 40 DescriptorSet 0
                               Decorate 53(g_tTex1di4) Binding 1
-                              Decorate 63(g_tTex1du4) DescriptorSet 0
+                              Decorate 53(g_tTex1di4) DescriptorSet 0
                               Decorate 63(g_tTex1du4) Binding 2
-                              Decorate 74(g_tTex2df4) DescriptorSet 0
+                              Decorate 63(g_tTex1du4) DescriptorSet 0
                               Decorate 74(g_tTex2df4) Binding 3
-                              Decorate 88(g_tTex2di4) DescriptorSet 0
+                              Decorate 74(g_tTex2df4) DescriptorSet 0
                               Decorate 88(g_tTex2di4) Binding 4
-                              Decorate 99(g_tTex2du4) DescriptorSet 0
+                              Decorate 88(g_tTex2di4) DescriptorSet 0
                               Decorate 99(g_tTex2du4) Binding 5
-                              Decorate 110(g_tTex3df4) DescriptorSet 0
+                              Decorate 99(g_tTex2du4) DescriptorSet 0
                               Decorate 110(g_tTex3df4) Binding 6
-                              Decorate 124(g_tTex3di4) DescriptorSet 0
+                              Decorate 110(g_tTex3df4) DescriptorSet 0
                               Decorate 124(g_tTex3di4) Binding 7
-                              Decorate 135(g_tTex3du4) DescriptorSet 0
+                              Decorate 124(g_tTex3di4) DescriptorSet 0
                               Decorate 135(g_tTex3du4) Binding 8
+                              Decorate 135(g_tTex3du4) DescriptorSet 0
                               Decorate 159(@entryPointOutput.Color) Location 0
                               Decorate 163(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 168(g_sSamp) DescriptorSet 0
                               Decorate 168(g_sSamp) Binding 0
-                              Decorate 171(g_tTexcdf4) DescriptorSet 0
+                              Decorate 168(g_sSamp) DescriptorSet 0
                               Decorate 171(g_tTexcdf4) Binding 0
-                              Decorate 174(g_tTexcdi4) DescriptorSet 0
+                              Decorate 171(g_tTexcdf4) DescriptorSet 0
                               Decorate 174(g_tTexcdi4) Binding 0
-                              Decorate 177(g_tTexcdu4) DescriptorSet 0
+                              Decorate 174(g_tTexcdi4) DescriptorSet 0
                               Decorate 177(g_tTexcdu4) Binding 0
-                              Decorate 180(g_tTex1df4a) DescriptorSet 0
+                              Decorate 177(g_tTexcdu4) DescriptorSet 0
                               Decorate 180(g_tTex1df4a) Binding 0
-                              Decorate 183(g_tTex1di4a) DescriptorSet 0
+                              Decorate 180(g_tTex1df4a) DescriptorSet 0
                               Decorate 183(g_tTex1di4a) Binding 0
-                              Decorate 186(g_tTex1du4a) DescriptorSet 0
+                              Decorate 183(g_tTex1di4a) DescriptorSet 0
                               Decorate 186(g_tTex1du4a) Binding 0
-                              Decorate 189(g_tTex2df4a) DescriptorSet 0
+                              Decorate 186(g_tTex1du4a) DescriptorSet 0
                               Decorate 189(g_tTex2df4a) Binding 0
-                              Decorate 192(g_tTex2di4a) DescriptorSet 0
+                              Decorate 189(g_tTex2df4a) DescriptorSet 0
                               Decorate 192(g_tTex2di4a) Binding 0
-                              Decorate 195(g_tTex2du4a) DescriptorSet 0
+                              Decorate 192(g_tTex2di4a) DescriptorSet 0
                               Decorate 195(g_tTex2du4a) Binding 0
-                              Decorate 198(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 195(g_tTex2du4a) DescriptorSet 0
                               Decorate 198(g_tTexcdf4a) Binding 0
-                              Decorate 201(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 198(g_tTexcdf4a) DescriptorSet 0
                               Decorate 201(g_tTexcdi4a) Binding 0
-                              Decorate 204(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 201(g_tTexcdi4a) DescriptorSet 0
                               Decorate 204(g_tTexcdu4a) Binding 0
+                              Decorate 204(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
index bc5f632d..0cfd2a87 100644
--- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
@@ -478,59 +478,59 @@ using depth_any
                               Name 169  "g_tTexcdf4a"
                               Name 172  "g_tTexcdi4a"
                               Name 175  "g_tTexcdu4a"
-                              Decorate 28(g_tTex1df4a) DescriptorSet 0
                               Decorate 28(g_tTex1df4a) Binding 1
+                              Decorate 28(g_tTex1df4a) DescriptorSet 0
+                              Decorate 32($Global) Block
                               MemberDecorate 32($Global) 0 Offset 0
                               MemberDecorate 32($Global) 1 Offset 8
                               MemberDecorate 32($Global) 2 Offset 16
                               MemberDecorate 32($Global) 3 Offset 32
-                              Decorate 32($Global) Block
-                              Decorate 34 DescriptorSet 0
                               Decorate 34 Binding 7
-                              Decorate 49(g_tTex1di4a) DescriptorSet 0
+                              Decorate 34 DescriptorSet 0
                               Decorate 49(g_tTex1di4a) Binding 2
-                              Decorate 60(g_tTex1du4a) DescriptorSet 0
+                              Decorate 49(g_tTex1di4a) DescriptorSet 0
                               Decorate 60(g_tTex1du4a) Binding 3
-                              Decorate 72(g_tTex2df4a) DescriptorSet 0
+                              Decorate 60(g_tTex1du4a) DescriptorSet 0
                               Decorate 72(g_tTex2df4a) Binding 4
-                              Decorate 86(g_tTex2di4a) DescriptorSet 0
+                              Decorate 72(g_tTex2df4a) DescriptorSet 0
                               Decorate 86(g_tTex2di4a) Binding 5
-                              Decorate 97(g_tTex2du4a) DescriptorSet 0
+                              Decorate 86(g_tTex2di4a) DescriptorSet 0
                               Decorate 97(g_tTex2du4a) Binding 6
+                              Decorate 97(g_tTex2du4a) DescriptorSet 0
                               Decorate 121(@entryPointOutput.Color) Location 0
                               Decorate 125(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 130(g_sSamp) DescriptorSet 0
                               Decorate 130(g_sSamp) Binding 0
-                              Decorate 133(g_tTex1df4) DescriptorSet 0
+                              Decorate 130(g_sSamp) DescriptorSet 0
                               Decorate 133(g_tTex1df4) Binding 0
-                              Decorate 136(g_tTex1di4) DescriptorSet 0
+                              Decorate 133(g_tTex1df4) DescriptorSet 0
                               Decorate 136(g_tTex1di4) Binding 0
-                              Decorate 139(g_tTex1du4) DescriptorSet 0
+                              Decorate 136(g_tTex1di4) DescriptorSet 0
                               Decorate 139(g_tTex1du4) Binding 0
-                              Decorate 142(g_tTex2df4) DescriptorSet 0
+                              Decorate 139(g_tTex1du4) DescriptorSet 0
                               Decorate 142(g_tTex2df4) Binding 0
-                              Decorate 145(g_tTex2di4) DescriptorSet 0
+                              Decorate 142(g_tTex2df4) DescriptorSet 0
                               Decorate 145(g_tTex2di4) Binding 0
-                              Decorate 148(g_tTex2du4) DescriptorSet 0
+                              Decorate 145(g_tTex2di4) DescriptorSet 0
                               Decorate 148(g_tTex2du4) Binding 0
-                              Decorate 151(g_tTex3df4) DescriptorSet 0
+                              Decorate 148(g_tTex2du4) DescriptorSet 0
                               Decorate 151(g_tTex3df4) Binding 0
-                              Decorate 154(g_tTex3di4) DescriptorSet 0
+                              Decorate 151(g_tTex3df4) DescriptorSet 0
                               Decorate 154(g_tTex3di4) Binding 0
-                              Decorate 157(g_tTex3du4) DescriptorSet 0
+                              Decorate 154(g_tTex3di4) DescriptorSet 0
                               Decorate 157(g_tTex3du4) Binding 0
-                              Decorate 160(g_tTexcdf4) DescriptorSet 0
+                              Decorate 157(g_tTex3du4) DescriptorSet 0
                               Decorate 160(g_tTexcdf4) Binding 0
-                              Decorate 163(g_tTexcdi4) DescriptorSet 0
+                              Decorate 160(g_tTexcdf4) DescriptorSet 0
                               Decorate 163(g_tTexcdi4) Binding 0
-                              Decorate 166(g_tTexcdu4) DescriptorSet 0
+                              Decorate 163(g_tTexcdi4) DescriptorSet 0
                               Decorate 166(g_tTexcdu4) Binding 0
-                              Decorate 169(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 166(g_tTexcdu4) DescriptorSet 0
                               Decorate 169(g_tTexcdf4a) Binding 0
-                              Decorate 172(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 169(g_tTexcdf4a) DescriptorSet 0
                               Decorate 172(g_tTexcdi4a) Binding 0
-                              Decorate 175(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 172(g_tTexcdi4a) DescriptorSet 0
                               Decorate 175(g_tTexcdu4a) Binding 0
+                              Decorate 175(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
index ed6f5286..78fbf417 100644
--- a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
@@ -139,8 +139,9 @@ gl_FragCoord origin is upper left
                               Name 39  "g_tBuffI"
                               Name 45  "psout"
                               Name 54  "@entryPointOutput.Color"
-                              Decorate 14(g_tBuffF) DescriptorSet 0
                               Decorate 14(g_tBuffF) Binding 0
+                              Decorate 14(g_tBuffF) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -149,13 +150,12 @@ gl_FragCoord origin is upper left
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 3
-                              Decorate 31(g_tBuffU) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 31(g_tBuffU) Binding 2
-                              Decorate 39(g_tBuffI) DescriptorSet 0
+                              Decorate 31(g_tBuffU) DescriptorSet 0
                               Decorate 39(g_tBuffI) Binding 1
+                              Decorate 39(g_tBuffI) DescriptorSet 0
                               Decorate 54(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out
index a94da2fc..e8bf2901 100644
--- a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out
@@ -254,8 +254,9 @@ using depth_any
                               Name 112  "g_tTex3df4"
                               Name 115  "g_tTex3di4"
                               Name 118  "g_tTex3du4"
-                              Decorate 14(g_tTex1df4a) DescriptorSet 0
                               Decorate 14(g_tTex1df4a) Binding 1
+                              Decorate 14(g_tTex1df4a) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -264,41 +265,40 @@ using depth_any
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 7
-                              Decorate 30(g_tTex1di4a) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 30(g_tTex1di4a) Binding 2
-                              Decorate 38(g_tTex1du4a) DescriptorSet 0
+                              Decorate 30(g_tTex1di4a) DescriptorSet 0
                               Decorate 38(g_tTex1du4a) Binding 3
-                              Decorate 46(g_tTex2df4a) DescriptorSet 0
+                              Decorate 38(g_tTex1du4a) DescriptorSet 0
                               Decorate 46(g_tTex2df4a) Binding 4
-                              Decorate 55(g_tTex2di4a) DescriptorSet 0
+                              Decorate 46(g_tTex2df4a) DescriptorSet 0
                               Decorate 55(g_tTex2di4a) Binding 5
-                              Decorate 62(g_tTex2du4a) DescriptorSet 0
+                              Decorate 55(g_tTex2di4a) DescriptorSet 0
                               Decorate 62(g_tTex2du4a) Binding 6
+                              Decorate 62(g_tTex2du4a) DescriptorSet 0
                               Decorate 82(@entryPointOutput.Color) Location 0
                               Decorate 86(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 91(g_sSamp) DescriptorSet 0
                               Decorate 91(g_sSamp) Binding 0
-                              Decorate 94(g_tTex1df4) DescriptorSet 0
+                              Decorate 91(g_sSamp) DescriptorSet 0
                               Decorate 94(g_tTex1df4) Binding 0
-                              Decorate 97(g_tTex1di4) DescriptorSet 0
+                              Decorate 94(g_tTex1df4) DescriptorSet 0
                               Decorate 97(g_tTex1di4) Binding 0
-                              Decorate 100(g_tTex1du4) DescriptorSet 0
+                              Decorate 97(g_tTex1di4) DescriptorSet 0
                               Decorate 100(g_tTex1du4) Binding 0
-                              Decorate 103(g_tTex2df4) DescriptorSet 0
+                              Decorate 100(g_tTex1du4) DescriptorSet 0
                               Decorate 103(g_tTex2df4) Binding 0
-                              Decorate 106(g_tTex2di4) DescriptorSet 0
+                              Decorate 103(g_tTex2df4) DescriptorSet 0
                               Decorate 106(g_tTex2di4) Binding 0
-                              Decorate 109(g_tTex2du4) DescriptorSet 0
+                              Decorate 106(g_tTex2di4) DescriptorSet 0
                               Decorate 109(g_tTex2du4) Binding 0
-                              Decorate 112(g_tTex3df4) DescriptorSet 0
+                              Decorate 109(g_tTex2du4) DescriptorSet 0
                               Decorate 112(g_tTex3df4) Binding 0
-                              Decorate 115(g_tTex3di4) DescriptorSet 0
+                              Decorate 112(g_tTex3df4) DescriptorSet 0
                               Decorate 115(g_tTex3di4) Binding 0
-                              Decorate 118(g_tTex3du4) DescriptorSet 0
+                              Decorate 115(g_tTex3di4) DescriptorSet 0
                               Decorate 118(g_tTex3du4) Binding 0
+                              Decorate 118(g_tTex3du4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
index b00da802..d829dda5 100644
--- a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
@@ -290,8 +290,9 @@ using depth_any
                               Name 125  "g_tTex2df4a"
                               Name 128  "g_tTex2di4a"
                               Name 131  "g_tTex2du4a"
-                              Decorate 14(g_tTex1df4) DescriptorSet 0
                               Decorate 14(g_tTex1df4) Binding 0
+                              Decorate 14(g_tTex1df4) DescriptorSet 0
+                              Decorate 20($Global) Block
                               MemberDecorate 20($Global) 0 Offset 0
                               MemberDecorate 20($Global) 1 Offset 8
                               MemberDecorate 20($Global) 2 Offset 16
@@ -300,41 +301,40 @@ using depth_any
                               MemberDecorate 20($Global) 5 Offset 56
                               MemberDecorate 20($Global) 6 Offset 64
                               MemberDecorate 20($Global) 7 Offset 80
-                              Decorate 20($Global) Block
-                              Decorate 22 DescriptorSet 0
                               Decorate 22 Binding 9
-                              Decorate 30(g_tTex1di4) DescriptorSet 0
+                              Decorate 22 DescriptorSet 0
                               Decorate 30(g_tTex1di4) Binding 1
-                              Decorate 38(g_tTex1du4) DescriptorSet 0
+                              Decorate 30(g_tTex1di4) DescriptorSet 0
                               Decorate 38(g_tTex1du4) Binding 2
-                              Decorate 46(g_tTex2df4) DescriptorSet 0
+                              Decorate 38(g_tTex1du4) DescriptorSet 0
                               Decorate 46(g_tTex2df4) Binding 3
-                              Decorate 55(g_tTex2di4) DescriptorSet 0
+                              Decorate 46(g_tTex2df4) DescriptorSet 0
                               Decorate 55(g_tTex2di4) Binding 4
-                              Decorate 62(g_tTex2du4) DescriptorSet 0
+                              Decorate 55(g_tTex2di4) DescriptorSet 0
                               Decorate 62(g_tTex2du4) Binding 5
-                              Decorate 69(g_tTex3df4) DescriptorSet 0
+                              Decorate 62(g_tTex2du4) DescriptorSet 0
                               Decorate 69(g_tTex3df4) Binding 6
-                              Decorate 78(g_tTex3di4) DescriptorSet 0
+                              Decorate 69(g_tTex3df4) DescriptorSet 0
                               Decorate 78(g_tTex3di4) Binding 7
-                              Decorate 85(g_tTex3du4) DescriptorSet 0
+                              Decorate 78(g_tTex3di4) DescriptorSet 0
                               Decorate 85(g_tTex3du4) Binding 8
+                              Decorate 85(g_tTex3du4) DescriptorSet 0
                               Decorate 104(@entryPointOutput.Color) Location 0
                               Decorate 108(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 113(g_sSamp) DescriptorSet 0
                               Decorate 113(g_sSamp) Binding 0
-                              Decorate 116(g_tTex1df4a) DescriptorSet 0
+                              Decorate 113(g_sSamp) DescriptorSet 0
                               Decorate 116(g_tTex1df4a) Binding 0
-                              Decorate 119(g_tTex1di4a) DescriptorSet 0
+                              Decorate 116(g_tTex1df4a) DescriptorSet 0
                               Decorate 119(g_tTex1di4a) Binding 0
-                              Decorate 122(g_tTex1du4a) DescriptorSet 0
+                              Decorate 119(g_tTex1di4a) DescriptorSet 0
                               Decorate 122(g_tTex1du4a) Binding 0
-                              Decorate 125(g_tTex2df4a) DescriptorSet 0
+                              Decorate 122(g_tTex1du4a) DescriptorSet 0
                               Decorate 125(g_tTex2df4a) Binding 0
-                              Decorate 128(g_tTex2di4a) DescriptorSet 0
+                              Decorate 125(g_tTex2df4a) DescriptorSet 0
                               Decorate 128(g_tTex2di4a) Binding 0
-                              Decorate 131(g_tTex2du4a) DescriptorSet 0
+                              Decorate 128(g_tTex2di4a) DescriptorSet 0
                               Decorate 131(g_tTex2du4a) Binding 0
+                              Decorate 131(g_tTex2du4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.logical.binary.frag.out b/Test/baseResults/hlsl.logical.binary.frag.out
index e6f484e4..97d1de1f 100644
--- a/Test/baseResults/hlsl.logical.binary.frag.out
+++ b/Test/baseResults/hlsl.logical.binary.frag.out
@@ -145,13 +145,13 @@ gl_FragCoord origin is upper left
                               Name 16  ""
                               Name 44  "psout"
                               Name 53  "@entryPointOutput.Color"
+                              Decorate 14($Global) Block
                               MemberDecorate 14($Global) 0 Offset 0
                               MemberDecorate 14($Global) 1 Offset 16
                               MemberDecorate 14($Global) 2 Offset 32
                               MemberDecorate 14($Global) 3 Offset 48
-                              Decorate 14($Global) Block
-                              Decorate 16 DescriptorSet 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 53(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.logical.binary.vec.frag.out b/Test/baseResults/hlsl.logical.binary.vec.frag.out
index 986d83fd..04b02d4e 100644
--- a/Test/baseResults/hlsl.logical.binary.vec.frag.out
+++ b/Test/baseResults/hlsl.logical.binary.vec.frag.out
@@ -282,13 +282,13 @@ gl_FragCoord origin is upper left
                               Name 77  "r21"
                               Name 87  "psout"
                               Name 112  "@entryPointOutput.Color"
+                              Decorate 18($Global) Block
                               MemberDecorate 18($Global) 0 Offset 0
                               MemberDecorate 18($Global) 1 Offset 16
                               MemberDecorate 18($Global) 2 Offset 32
                               MemberDecorate 18($Global) 3 Offset 36
-                              Decorate 18($Global) Block
-                              Decorate 20 DescriptorSet 0
                               Decorate 20 Binding 0
+                              Decorate 20 DescriptorSet 0
                               Decorate 112(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.logical.unary.frag.out b/Test/baseResults/hlsl.logical.unary.frag.out
index cc933bbc..23655d8d 100644
--- a/Test/baseResults/hlsl.logical.unary.frag.out
+++ b/Test/baseResults/hlsl.logical.unary.frag.out
@@ -205,13 +205,13 @@ gl_FragCoord origin is upper left
                               Name 16  ""
                               Name 72  "psout"
                               Name 81  "@entryPointOutput.Color"
+                              Decorate 14($Global) Block
                               MemberDecorate 14($Global) 0 Offset 0
                               MemberDecorate 14($Global) 1 Offset 16
                               MemberDecorate 14($Global) 2 Offset 32
                               MemberDecorate 14($Global) 3 Offset 48
-                              Decorate 14($Global) Block
-                              Decorate 16 DescriptorSet 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 81(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.matType.frag.out b/Test/baseResults/hlsl.matType.frag.out
index 92d44a46..47fb02a1 100644
--- a/Test/baseResults/hlsl.matType.frag.out
+++ b/Test/baseResults/hlsl.matType.frag.out
@@ -54,25 +54,25 @@ Validation failed
                               MemberName 27($Global) 4  "dmat23"
                               MemberName 27($Global) 5  "int44"
                               Name 29  ""
+                              Decorate 27($Global) Block
                               MemberDecorate 27($Global) 0 Offset 0
                               MemberDecorate 27($Global) 1 RowMajor
-                              MemberDecorate 27($Global) 1 Offset 16
                               MemberDecorate 27($Global) 1 MatrixStride 16
+                              MemberDecorate 27($Global) 1 Offset 16
                               MemberDecorate 27($Global) 2 RowMajor
-                              MemberDecorate 27($Global) 2 Offset 32
                               MemberDecorate 27($Global) 2 MatrixStride 16
+                              MemberDecorate 27($Global) 2 Offset 32
                               MemberDecorate 27($Global) 3 RowMajor
-                              MemberDecorate 27($Global) 3 Offset 48
                               MemberDecorate 27($Global) 3 MatrixStride 16
+                              MemberDecorate 27($Global) 3 Offset 48
                               MemberDecorate 27($Global) 4 RowMajor
-                              MemberDecorate 27($Global) 4 Offset 80
                               MemberDecorate 27($Global) 4 MatrixStride 16
+                              MemberDecorate 27($Global) 4 Offset 80
                               MemberDecorate 27($Global) 5 RowMajor
-                              MemberDecorate 27($Global) 5 Offset 128
                               MemberDecorate 27($Global) 5 MatrixStride 16
-                              Decorate 27($Global) Block
-                              Decorate 29 DescriptorSet 0
+                              MemberDecorate 27($Global) 5 Offset 128
                               Decorate 29 Binding 0
+                              Decorate 29 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.matpack-1.frag.out b/Test/baseResults/hlsl.matpack-1.frag.out
index 5af6c2b5..844b0855 100644
--- a/Test/baseResults/hlsl.matpack-1.frag.out
+++ b/Test/baseResults/hlsl.matpack-1.frag.out
@@ -126,25 +126,25 @@ gl_FragCoord origin is upper left
                               Name 16  ""
                               Name 37  "@entryPointOutput"
                               MemberDecorate 12(MyBuffer1) 0 RowMajor
-                              MemberDecorate 12(MyBuffer1) 0 Offset 0
                               MemberDecorate 12(MyBuffer1) 0 MatrixStride 16
+                              MemberDecorate 12(MyBuffer1) 0 Offset 0
                               MemberDecorate 12(MyBuffer1) 1 ColMajor
-                              MemberDecorate 12(MyBuffer1) 1 Offset 64
                               MemberDecorate 12(MyBuffer1) 1 MatrixStride 16
+                              MemberDecorate 12(MyBuffer1) 1 Offset 64
                               MemberDecorate 12(MyBuffer1) 2 Offset 128
                               MemberDecorate 12(MyBuffer1) 3 Offset 144
                               MemberDecorate 13(MyBuffer2) 0 ColMajor
-                              MemberDecorate 13(MyBuffer2) 0 Offset 0
                               MemberDecorate 13(MyBuffer2) 0 MatrixStride 16
+                              MemberDecorate 13(MyBuffer2) 0 Offset 0
                               MemberDecorate 13(MyBuffer2) 1 Offset 64
+                              Decorate 14(Example) Block
                               MemberDecorate 14(Example) 0 Offset 0
                               MemberDecorate 14(Example) 1 Offset 160
                               MemberDecorate 14(Example) 2 RowMajor
-                              MemberDecorate 14(Example) 2 Offset 240
                               MemberDecorate 14(Example) 2 MatrixStride 16
-                              Decorate 14(Example) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(Example) 2 Offset 240
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 37(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.matpack-pragma-global.frag.out b/Test/baseResults/hlsl.matpack-pragma-global.frag.out
index d6afb4e9..c64fcb0a 100644
--- a/Test/baseResults/hlsl.matpack-pragma-global.frag.out
+++ b/Test/baseResults/hlsl.matpack-pragma-global.frag.out
@@ -67,12 +67,12 @@ gl_FragCoord origin is upper left
                               MemberName 12($Global) 0  "g_GlobalMat1"
                               Name 14  ""
                               Name 23  "@entryPointOutput"
-                              MemberDecorate 12($Global) 0 ColMajor
-                              MemberDecorate 12($Global) 0 Offset 0
-                              MemberDecorate 12($Global) 0 MatrixStride 16
                               Decorate 12($Global) Block
-                              Decorate 14 DescriptorSet 0
+                              MemberDecorate 12($Global) 0 ColMajor
+                              MemberDecorate 12($Global) 0 MatrixStride 16
+                              MemberDecorate 12($Global) 0 Offset 0
                               Decorate 14 Binding 0
+                              Decorate 14 DescriptorSet 0
                               Decorate 23(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.matpack-pragma.frag.out b/Test/baseResults/hlsl.matpack-pragma.frag.out
index aac5af5f..5938a031 100644
--- a/Test/baseResults/hlsl.matpack-pragma.frag.out
+++ b/Test/baseResults/hlsl.matpack-pragma.frag.out
@@ -196,31 +196,31 @@ gl_FragCoord origin is upper left
                               Name 16  ""
                               Name 42  "@entryPointOutput"
                               MemberDecorate 12(MyBuffer1) 0 RowMajor
-                              MemberDecorate 12(MyBuffer1) 0 Offset 0
                               MemberDecorate 12(MyBuffer1) 0 MatrixStride 16
+                              MemberDecorate 12(MyBuffer1) 0 Offset 0
                               MemberDecorate 12(MyBuffer1) 1 ColMajor
-                              MemberDecorate 12(MyBuffer1) 1 Offset 64
                               MemberDecorate 12(MyBuffer1) 1 MatrixStride 16
+                              MemberDecorate 12(MyBuffer1) 1 Offset 64
                               MemberDecorate 12(MyBuffer1) 2 ColMajor
-                              MemberDecorate 12(MyBuffer1) 2 Offset 128
                               MemberDecorate 12(MyBuffer1) 2 MatrixStride 16
+                              MemberDecorate 12(MyBuffer1) 2 Offset 128
                               MemberDecorate 13(MyBuffer2) 0 RowMajor
-                              MemberDecorate 13(MyBuffer2) 0 Offset 0
                               MemberDecorate 13(MyBuffer2) 0 MatrixStride 16
+                              MemberDecorate 13(MyBuffer2) 0 Offset 0
                               MemberDecorate 13(MyBuffer2) 1 ColMajor
-                              MemberDecorate 13(MyBuffer2) 1 Offset 64
                               MemberDecorate 13(MyBuffer2) 1 MatrixStride 16
+                              MemberDecorate 13(MyBuffer2) 1 Offset 64
                               MemberDecorate 13(MyBuffer2) 2 RowMajor
-                              MemberDecorate 13(MyBuffer2) 2 Offset 128
                               MemberDecorate 13(MyBuffer2) 2 MatrixStride 16
+                              MemberDecorate 13(MyBuffer2) 2 Offset 128
+                              Decorate 14(Example) Block
                               MemberDecorate 14(Example) 0 Offset 0
                               MemberDecorate 14(Example) 1 Offset 192
                               MemberDecorate 14(Example) 2 RowMajor
-                              MemberDecorate 14(Example) 2 Offset 384
                               MemberDecorate 14(Example) 2 MatrixStride 16
-                              Decorate 14(Example) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(Example) 2 Offset 384
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 42(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out
index cf75c056..418bc2f5 100644
--- a/Test/baseResults/hlsl.matrixindex.frag.out
+++ b/Test/baseResults/hlsl.matrixindex.frag.out
@@ -309,13 +309,13 @@ gl_FragCoord origin is upper left
                               Name 63  "r0c"
                               Name 71  "psout"
                               Name 80  "@entryPointOutput.Color"
+                              Decorate 52($Global) Block
                               MemberDecorate 52($Global) 0 Offset 0
                               MemberDecorate 52($Global) 1 RowMajor
-                              MemberDecorate 52($Global) 1 Offset 16
                               MemberDecorate 52($Global) 1 MatrixStride 16
-                              Decorate 52($Global) Block
-                              Decorate 54 DescriptorSet 0
+                              MemberDecorate 52($Global) 1 Offset 16
                               Decorate 54 Binding 0
+                              Decorate 54 DescriptorSet 0
                               Decorate 80(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.mintypes.frag.out b/Test/baseResults/hlsl.mintypes.frag.out
index 2b51d12c..9d0b3c94 100644
--- a/Test/baseResults/hlsl.mintypes.frag.out
+++ b/Test/baseResults/hlsl.mintypes.frag.out
@@ -294,13 +294,13 @@ gl_FragCoord origin is upper left
                               Decorate 114 RelaxedPrecision
                               Decorate 115 RelaxedPrecision
                               Decorate 126(@entryPointOutput.Color) Location 0
+                              Decorate 129($Global) Block
                               MemberDecorate 129($Global) 0 RelaxedPrecision
                               MemberDecorate 129($Global) 0 Offset 0
                               MemberDecorate 129($Global) 1 RelaxedPrecision
                               MemberDecorate 129($Global) 1 Offset 4
-                              Decorate 129($Global) Block
-                              Decorate 131 DescriptorSet 0
                               Decorate 131 Binding 0
+                              Decorate 131 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.mip.operator.frag.out b/Test/baseResults/hlsl.mip.operator.frag.out
index 2c03a260..c69cf8df 100644
--- a/Test/baseResults/hlsl.mip.operator.frag.out
+++ b/Test/baseResults/hlsl.mip.operator.frag.out
@@ -142,10 +142,10 @@ gl_FragCoord origin is upper left
                               Name 13  "g_tTex2df4"
                               Name 25  "g_tTex2df4a"
                               Name 59  "@entryPointOutput"
-                              Decorate 13(g_tTex2df4) DescriptorSet 0
                               Decorate 13(g_tTex2df4) Binding 1
-                              Decorate 25(g_tTex2df4a) DescriptorSet 0
+                              Decorate 13(g_tTex2df4) DescriptorSet 0
                               Decorate 25(g_tTex2df4a) Binding 0
+                              Decorate 25(g_tTex2df4a) DescriptorSet 0
                               Decorate 59(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.mul-truncate.frag.out b/Test/baseResults/hlsl.mul-truncate.frag.out
index 806d2419..c736d25f 100644
--- a/Test/baseResults/hlsl.mul-truncate.frag.out
+++ b/Test/baseResults/hlsl.mul-truncate.frag.out
@@ -416,30 +416,30 @@ gl_FragCoord origin is upper left
                               Name 133  "r32"
                               Name 146  "r33"
                               Name 188  "@entryPointOutput"
+                              Decorate 21(Matrix) Block
                               MemberDecorate 21(Matrix) 0 RowMajor
-                              MemberDecorate 21(Matrix) 0 Offset 0
                               MemberDecorate 21(Matrix) 0 MatrixStride 16
+                              MemberDecorate 21(Matrix) 0 Offset 0
                               MemberDecorate 21(Matrix) 1 RowMajor
-                              MemberDecorate 21(Matrix) 1 Offset 64
                               MemberDecorate 21(Matrix) 1 MatrixStride 16
+                              MemberDecorate 21(Matrix) 1 Offset 64
                               MemberDecorate 21(Matrix) 2 RowMajor
-                              MemberDecorate 21(Matrix) 2 Offset 112
                               MemberDecorate 21(Matrix) 2 MatrixStride 16
+                              MemberDecorate 21(Matrix) 2 Offset 112
                               MemberDecorate 21(Matrix) 3 RowMajor
-                              MemberDecorate 21(Matrix) 3 Offset 176
                               MemberDecorate 21(Matrix) 3 MatrixStride 16
+                              MemberDecorate 21(Matrix) 3 Offset 176
                               MemberDecorate 21(Matrix) 4 RowMajor
-                              MemberDecorate 21(Matrix) 4 Offset 224
                               MemberDecorate 21(Matrix) 4 MatrixStride 16
+                              MemberDecorate 21(Matrix) 4 Offset 224
                               MemberDecorate 21(Matrix) 5 RowMajor
-                              MemberDecorate 21(Matrix) 5 Offset 288
                               MemberDecorate 21(Matrix) 5 MatrixStride 16
+                              MemberDecorate 21(Matrix) 5 Offset 288
                               MemberDecorate 21(Matrix) 6 Offset 320
                               MemberDecorate 21(Matrix) 7 Offset 336
                               MemberDecorate 21(Matrix) 8 Offset 352
-                              Decorate 21(Matrix) Block
-                              Decorate 23 DescriptorSet 0
                               Decorate 23 Binding 0
+                              Decorate 23 DescriptorSet 0
                               Decorate 188(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.multiDescriptorSet.frag.out b/Test/baseResults/hlsl.multiDescriptorSet.frag.out
index d79b1213..bf0b7b13 100644
--- a/Test/baseResults/hlsl.multiDescriptorSet.frag.out
+++ b/Test/baseResults/hlsl.multiDescriptorSet.frag.out
@@ -35,36 +35,36 @@ hlsl.multiDescriptorSet.frag
                               Name 87  "param"
                               Name 90  "txDiffuseB"
                               Name 91  "samLinearB"
-                              MemberDecorate 23(cbChangesEveryFrame) 0 RowMajor
-                              MemberDecorate 23(cbChangesEveryFrame) 0 Offset 0
-                              MemberDecorate 23(cbChangesEveryFrame) 0 MatrixStride 16
-                              MemberDecorate 23(cbChangesEveryFrame) 1 Offset 64
                               Decorate 23(cbChangesEveryFrame) Block
-                              Decorate 25 DescriptorSet 2
+                              MemberDecorate 23(cbChangesEveryFrame) 0 RowMajor
+                              MemberDecorate 23(cbChangesEveryFrame) 0 MatrixStride 16
+                              MemberDecorate 23(cbChangesEveryFrame) 0 Offset 0
+                              MemberDecorate 23(cbChangesEveryFrame) 1 Offset 64
                               Decorate 25 Binding 2
-                              MemberDecorate 34(cbNeverChanges) 0 RowMajor
-                              MemberDecorate 34(cbNeverChanges) 0 Offset 0
-                              MemberDecorate 34(cbNeverChanges) 0 MatrixStride 16
+                              Decorate 25 DescriptorSet 2
                               Decorate 34(cbNeverChanges) Block
-                              Decorate 36 DescriptorSet 2
+                              MemberDecorate 34(cbNeverChanges) 0 RowMajor
+                              MemberDecorate 34(cbNeverChanges) 0 MatrixStride 16
+                              MemberDecorate 34(cbNeverChanges) 0 Offset 0
                               Decorate 36 Binding 0
-                              MemberDecorate 43(cbChangeOnResize) 0 RowMajor
-                              MemberDecorate 43(cbChangeOnResize) 0 Offset 0
-                              MemberDecorate 43(cbChangeOnResize) 0 MatrixStride 16
+                              Decorate 36 DescriptorSet 2
                               Decorate 43(cbChangeOnResize) Block
-                              Decorate 45 DescriptorSet 2
+                              MemberDecorate 43(cbChangeOnResize) 0 RowMajor
+                              MemberDecorate 43(cbChangeOnResize) 0 MatrixStride 16
+                              MemberDecorate 43(cbChangeOnResize) 0 Offset 0
                               Decorate 45 Binding 1
-                              Decorate 59(txDiffuseA) DescriptorSet 0
+                              Decorate 45 DescriptorSet 2
                               Decorate 59(txDiffuseA) Binding 0
-                              Decorate 63(samLinearA) DescriptorSet 0
+                              Decorate 59(txDiffuseA) DescriptorSet 0
                               Decorate 63(samLinearA) Binding 1
+                              Decorate 63(samLinearA) DescriptorSet 0
                               Decorate 78(input.Pos) BuiltIn FragCoord
                               Decorate 82(input.Tex) Location 0
                               Decorate 86(@entryPointOutput) Location 0
-                              Decorate 90(txDiffuseB) DescriptorSet 1
                               Decorate 90(txDiffuseB) Binding 0
-                              Decorate 91(samLinearB) DescriptorSet 1
+                              Decorate 90(txDiffuseB) DescriptorSet 1
                               Decorate 91(samLinearB) Binding 1
+                              Decorate 91(samLinearB) DescriptorSet 1
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.multiEntry.vert.out b/Test/baseResults/hlsl.multiEntry.vert.out
index 0e31ed6e..3bf8d79c 100644
--- a/Test/baseResults/hlsl.multiEntry.vert.out
+++ b/Test/baseResults/hlsl.multiEntry.vert.out
@@ -90,8 +90,8 @@ Shader version: 500
                               Name 34  "Index"
                               Name 37  "@entryPointOutput"
                               Name 38  "param"
-                              Decorate 19(Position) DescriptorSet 0
                               Decorate 19(Position) Binding 0
+                              Decorate 19(Position) DescriptorSet 0
                               Decorate 34(Index) BuiltIn VertexIndex
                               Decorate 37(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.multiReturn.frag.out b/Test/baseResults/hlsl.multiReturn.frag.out
index fbe7fbf9..38df9f05 100644
--- a/Test/baseResults/hlsl.multiReturn.frag.out
+++ b/Test/baseResults/hlsl.multiReturn.frag.out
@@ -74,12 +74,12 @@ gl_FragCoord origin is upper left
                               MemberDecorate 15(S) 0 Offset 0
                               MemberDecorate 15(S) 1 Offset 4
                               MemberDecorate 15(S) 2 RowMajor
-                              MemberDecorate 15(S) 2 Offset 16
                               MemberDecorate 15(S) 2 MatrixStride 16
-                              MemberDecorate 16(bufName) 0 Offset 0
+                              MemberDecorate 15(S) 2 Offset 16
                               Decorate 16(bufName) Block
-                              Decorate 18 DescriptorSet 0
+                              MemberDecorate 16(bufName) 0 Offset 0
                               Decorate 18 Binding 0
+                              Decorate 18 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.multiView.frag.out b/Test/baseResults/hlsl.multiView.frag.out
index 32e669ca..95c93444 100644
--- a/Test/baseResults/hlsl.multiView.frag.out
+++ b/Test/baseResults/hlsl.multiView.frag.out
@@ -84,8 +84,8 @@ gl_FragCoord origin is upper left
                               Name 22  "ViewIndex"
                               Name 25  "@entryPointOutput"
                               Name 26  "param"
-                              Decorate 22(ViewIndex) Flat
                               Decorate 22(ViewIndex) BuiltIn ViewIndex
+                              Decorate 22(ViewIndex) Flat
                               Decorate 25(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.nested-runtimeArray.frag.out b/Test/baseResults/hlsl.nested-runtimeArray.frag.out
index f019290c..c80ea850 100644
--- a/Test/baseResults/hlsl.nested-runtimeArray.frag.out
+++ b/Test/baseResults/hlsl.nested-runtimeArray.frag.out
@@ -82,13 +82,13 @@ gl_FragCoord origin is upper left
                               Name 15  "B"
                               Name 24  "@entryPointOutput"
                               Decorate 10 ArrayStride 4
-                              MemberDecorate 11(A) 0 Offset 0
                               Decorate 11(A) BufferBlock
+                              MemberDecorate 11(A) 0 Offset 0
                               Decorate 12 ArrayStride 4
-                              MemberDecorate 13(B) 0 Offset 0
                               Decorate 13(B) BufferBlock
-                              Decorate 15(B) DescriptorSet 0
+                              MemberDecorate 13(B) 0 Offset 0
                               Decorate 15(B) Binding 0
+                              Decorate 15(B) DescriptorSet 0
                               Decorate 24(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.noSemantic.functionality1.comp.out b/Test/baseResults/hlsl.noSemantic.functionality1.comp.out
index 1121e0b0..ab02db0e 100644
--- a/Test/baseResults/hlsl.noSemantic.functionality1.comp.out
+++ b/Test/baseResults/hlsl.noSemantic.functionality1.comp.out
@@ -19,15 +19,15 @@ hlsl.noSemantic.functionality1.comp
                               MemberName 17(Buf@count) 0  "@count"
                               Name 19  "Buf@count"
                               Decorate 10 ArrayStride 16
-                              MemberDecorate 11(Buf) 0 Offset 0
                               Decorate 11(Buf) BufferBlock
-                              Decorate 13(Buf) DescriptorSet 0
+                              MemberDecorate 11(Buf) 0 Offset 0
                               Decorate 13(Buf) Binding 0
-                              MemberDecorate 17(Buf@count) 0 Offset 0
-                              Decorate 17(Buf@count) BufferBlock
-                              Decorate 19(Buf@count) DescriptorSet 0
-                              Decorate 19(Buf@count) Binding 0
+                              Decorate 13(Buf) DescriptorSet 0
                               DecorateId 13(Buf) DecorationHlslCounterBufferGOOGLE 19(Buf@count)
+                              Decorate 17(Buf@count) BufferBlock
+                              MemberDecorate 17(Buf@count) 0 Offset 0
+                              Decorate 19(Buf@count) Binding 0
+                              Decorate 19(Buf@count) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.opaque-type-bug.frag.out b/Test/baseResults/hlsl.opaque-type-bug.frag.out
index d82509d6..2c8a5546 100644
--- a/Test/baseResults/hlsl.opaque-type-bug.frag.out
+++ b/Test/baseResults/hlsl.opaque-type-bug.frag.out
@@ -75,8 +75,8 @@ gl_FragCoord origin is upper left
                               Name 20  "MyTexture"
                               Name 22  "final_RGB"
                               Name 23  "param"
-                              Decorate 20(MyTexture) DescriptorSet 0
                               Decorate 20(MyTexture) Binding 0
+                              Decorate 20(MyTexture) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.params.default.frag.out b/Test/baseResults/hlsl.params.default.frag.out
index be1f6416..81fc98c6 100644
--- a/Test/baseResults/hlsl.params.default.frag.out
+++ b/Test/baseResults/hlsl.params.default.frag.out
@@ -437,10 +437,10 @@ gl_FragCoord origin is upper left
                               Name 168  "param"
                               Name 169  "param"
                               Name 175  "@entryPointOutput"
-                              MemberDecorate 108($Global) 0 Offset 0
                               Decorate 108($Global) Block
-                              Decorate 110 DescriptorSet 0
+                              MemberDecorate 108($Global) 0 Offset 0
                               Decorate 110 Binding 0
+                              Decorate 110 DescriptorSet 0
                               Decorate 175(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.partialFlattenLocal.vert.out b/Test/baseResults/hlsl.partialFlattenLocal.vert.out
index 6a1b1ded..c18f10d3 100644
--- a/Test/baseResults/hlsl.partialFlattenLocal.vert.out
+++ b/Test/baseResults/hlsl.partialFlattenLocal.vert.out
@@ -262,8 +262,8 @@ Shader version: 500
                               Name 86  "pos"
                               Name 89  "@entryPointOutput"
                               Name 90  "param"
-                              Decorate 27(tex) DescriptorSet 0
                               Decorate 27(tex) Binding 0
+                              Decorate 27(tex) DescriptorSet 0
                               Decorate 86(pos) Location 0
                               Decorate 89(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.partialFlattenMixed.vert.out b/Test/baseResults/hlsl.partialFlattenMixed.vert.out
index eae3c98b..a34caad1 100644
--- a/Test/baseResults/hlsl.partialFlattenMixed.vert.out
+++ b/Test/baseResults/hlsl.partialFlattenMixed.vert.out
@@ -113,10 +113,10 @@ Shader version: 500
                               Name 36  "pos"
                               Name 39  "@entryPointOutput"
                               Name 40  "param"
-                              Decorate 24(tex[0]) DescriptorSet 0
                               Decorate 24(tex[0]) Binding 0
-                              Decorate 28(tex[1]) DescriptorSet 0
+                              Decorate 24(tex[0]) DescriptorSet 0
                               Decorate 28(tex[1]) Binding 1
+                              Decorate 28(tex[1]) DescriptorSet 0
                               Decorate 36(pos) Location 0
                               Decorate 39(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.pp.line2.frag.out b/Test/baseResults/hlsl.pp.line2.frag.out
index 1c73bceb..48697a6e 100644
--- a/Test/baseResults/hlsl.pp.line2.frag.out
+++ b/Test/baseResults/hlsl.pp.line2.frag.out
@@ -81,14 +81,14 @@ PS_OUTPUT MainPs ( PS_INPUT i )
                               Name 71  "i.vTextureCoords"
                               Name 75  "@entryPointOutput.vColor"
                               Name 76  "param"
+                              Decorate 19(PerViewConstantBuffer_t) Block
                               MemberDecorate 19(PerViewConstantBuffer_t) 0 Offset 0
                               MemberDecorate 19(PerViewConstantBuffer_t) 1 Offset 4
                               MemberDecorate 19(PerViewConstantBuffer_t) 2 Offset 8
-                              Decorate 19(PerViewConstantBuffer_t) Block
-                              Decorate 49(g_tColor) DescriptorSet 0
                               Decorate 49(g_tColor) Binding 0
-                              Decorate 56(g_sAniso) DescriptorSet 0
+                              Decorate 49(g_tColor) DescriptorSet 0
                               Decorate 56(g_sAniso) Binding 1
+                              Decorate 56(g_sAniso) DescriptorSet 0
                               Decorate 71(i.vTextureCoords) Location 0
                               Decorate 75(@entryPointOutput.vColor) Location 0
                3:             TypeVoid
diff --git a/Test/baseResults/hlsl.pp.line3.frag.out b/Test/baseResults/hlsl.pp.line3.frag.out
index 717a21b9..a2c43de8 100644
--- a/Test/baseResults/hlsl.pp.line3.frag.out
+++ b/Test/baseResults/hlsl.pp.line3.frag.out
@@ -72,14 +72,14 @@ PS_OUTPUT MainPs ( PS_INPUT i )
                               Name 69  "i.vTextureCoords"
                               Name 73  "@entryPointOutput.vColor"
                               Name 74  "param"
+                              Decorate 19(PerViewConstantBuffer_t) Block
                               MemberDecorate 19(PerViewConstantBuffer_t) 0 Offset 0
                               MemberDecorate 19(PerViewConstantBuffer_t) 1 Offset 4
                               MemberDecorate 19(PerViewConstantBuffer_t) 2 Offset 8
-                              Decorate 19(PerViewConstantBuffer_t) Block
-                              Decorate 47(g_tColor) DescriptorSet 0
                               Decorate 47(g_tColor) Binding 0
-                              Decorate 54(g_sAniso) DescriptorSet 0
+                              Decorate 47(g_tColor) DescriptorSet 0
                               Decorate 54(g_sAniso) Binding 0
+                              Decorate 54(g_sAniso) DescriptorSet 0
                               Decorate 69(i.vTextureCoords) Location 0
                               Decorate 73(@entryPointOutput.vColor) Location 0
                4:             TypeVoid
diff --git a/Test/baseResults/hlsl.pp.line4.frag.out b/Test/baseResults/hlsl.pp.line4.frag.out
index da968b23..af2ac0fe 100644
--- a/Test/baseResults/hlsl.pp.line4.frag.out
+++ b/Test/baseResults/hlsl.pp.line4.frag.out
@@ -72,14 +72,14 @@ PS_OUTPUT MainPs ( PS_INPUT i )
                               Name 55  "g_sAniso"
                               Name 70  "i.vTextureCoords"
                               Name 74  "@entryPointOutput.vColor"
+                              Decorate 19(PerViewConstantBuffer_t) Block
                               MemberDecorate 19(PerViewConstantBuffer_t) 0 Offset 0
                               MemberDecorate 19(PerViewConstantBuffer_t) 1 Offset 4
                               MemberDecorate 19(PerViewConstantBuffer_t) 2 Offset 8
-                              Decorate 19(PerViewConstantBuffer_t) Block
-                              Decorate 48(g_tColor) DescriptorSet 0
                               Decorate 48(g_tColor) Binding 0
-                              Decorate 55(g_sAniso) DescriptorSet 0
+                              Decorate 48(g_tColor) DescriptorSet 0
                               Decorate 55(g_sAniso) Binding 1
+                              Decorate 55(g_sAniso) DescriptorSet 0
                               Decorate 70(i.vTextureCoords) Location 0
                               Decorate 74(@entryPointOutput.vColor) Location 0
                3:             TypeVoid
diff --git a/Test/baseResults/hlsl.pp.vert.out b/Test/baseResults/hlsl.pp.vert.out
index 652cf174..c0850415 100644
--- a/Test/baseResults/hlsl.pp.vert.out
+++ b/Test/baseResults/hlsl.pp.vert.out
@@ -40,11 +40,11 @@ Shader version: 500
                               MemberName 10($Global) 0  "goodGlobal1"
                               MemberName 10($Global) 1  "goodGlobal2"
                               Name 12  ""
+                              Decorate 10($Global) Block
                               MemberDecorate 10($Global) 0 Offset 0
                               MemberDecorate 10($Global) 1 Offset 4
-                              Decorate 10($Global) Block
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                9:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.preprocessor.frag.out b/Test/baseResults/hlsl.preprocessor.frag.out
index 106762bf..d0795d8a 100644
--- a/Test/baseResults/hlsl.preprocessor.frag.out
+++ b/Test/baseResults/hlsl.preprocessor.frag.out
@@ -113,10 +113,10 @@ gl_FragCoord origin is upper left
                               Name 33  "input"
                               Name 36  "@entryPointOutput"
                               Name 37  "param"
-                              Decorate 16(test_texture) DescriptorSet 0
                               Decorate 16(test_texture) Binding 0
-                              Decorate 20(test_texture_ss) DescriptorSet 0
+                              Decorate 16(test_texture) DescriptorSet 0
                               Decorate 20(test_texture_ss) Binding 1
+                              Decorate 20(test_texture_ss) DescriptorSet 0
                               Decorate 33(input) Location 0
                               Decorate 36(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.promote.atomic.frag.out b/Test/baseResults/hlsl.promote.atomic.frag.out
index 91b1d587..22d578e3 100644
--- a/Test/baseResults/hlsl.promote.atomic.frag.out
+++ b/Test/baseResults/hlsl.promote.atomic.frag.out
@@ -81,8 +81,8 @@ gl_FragCoord origin is upper left
                               Name 18  "Loc"
                               Name 20  "Inc"
                               Name 34  "@entryPointOutput"
-                              Decorate 17(s_uintbuff) DescriptorSet 0
                               Decorate 17(s_uintbuff) Binding 0
+                              Decorate 17(s_uintbuff) DescriptorSet 0
                               Decorate 34(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.promote.binary.frag.out b/Test/baseResults/hlsl.promote.binary.frag.out
index f9f57a43..d2dee888 100644
--- a/Test/baseResults/hlsl.promote.binary.frag.out
+++ b/Test/baseResults/hlsl.promote.binary.frag.out
@@ -196,15 +196,15 @@ gl_FragCoord origin is upper left
                               Name 66  "l_int"
                               Name 73  "psout"
                               Name 80  "@entryPointOutput.Color"
+                              Decorate 16($Global) Block
                               MemberDecorate 16($Global) 0 Offset 0
                               MemberDecorate 16($Global) 1 Offset 16
                               MemberDecorate 16($Global) 2 Offset 32
                               MemberDecorate 16($Global) 3 Offset 48
                               MemberDecorate 16($Global) 4 Offset 64
                               MemberDecorate 16($Global) 5 Offset 80
-                              Decorate 16($Global) Block
-                              Decorate 18 DescriptorSet 0
                               Decorate 18 Binding 0
+                              Decorate 18 DescriptorSet 0
                               Decorate 80(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out
index 6d73cc7c..7bc2bb63 100644
--- a/Test/baseResults/hlsl.promotions.frag.out
+++ b/Test/baseResults/hlsl.promotions.frag.out
@@ -1683,6 +1683,7 @@ gl_FragCoord origin is upper left
                               Name 578  "outval"
                               Name 586  "psout"
                               Name 593  "@entryPointOutput.Color"
+                              Decorate 111($Global) Block
                               MemberDecorate 111($Global) 0 Offset 0
                               MemberDecorate 111($Global) 1 Offset 16
                               MemberDecorate 111($Global) 2 Offset 32
@@ -1693,9 +1694,8 @@ gl_FragCoord origin is upper left
                               MemberDecorate 111($Global) 7 Offset 96
                               MemberDecorate 111($Global) 8 Offset 100
                               MemberDecorate 111($Global) 9 Offset 104
-                              Decorate 111($Global) Block
-                              Decorate 113 DescriptorSet 0
                               Decorate 113 Binding 0
+                              Decorate 113 DescriptorSet 0
                               Decorate 593(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.rw.atomics.frag.out b/Test/baseResults/hlsl.rw.atomics.frag.out
index 83169f13..80754191 100644
--- a/Test/baseResults/hlsl.rw.atomics.frag.out
+++ b/Test/baseResults/hlsl.rw.atomics.frag.out
@@ -3996,8 +3996,9 @@ gl_FragCoord origin is upper left
                               Name 1140  "g_tTex2di1a"
                               Name 1143  "g_tTex2du1a"
                               Name 1146  "g_tBuffF"
-                              Decorate 15(g_tTex1di1) DescriptorSet 0
                               Decorate 15(g_tTex1di1) Binding 0
+                              Decorate 15(g_tTex1di1) DescriptorSet 0
+                              Decorate 21($Global) Block
                               MemberDecorate 21($Global) 0 Offset 0
                               MemberDecorate 21($Global) 1 Offset 8
                               MemberDecorate 21($Global) 2 Offset 16
@@ -4008,46 +4009,45 @@ gl_FragCoord origin is upper left
                               MemberDecorate 21($Global) 7 Offset 48
                               MemberDecorate 21($Global) 8 Offset 60
                               MemberDecorate 21($Global) 9 Offset 64
-                              Decorate 21($Global) Block
-                              Decorate 23 DescriptorSet 0
                               Decorate 23 Binding 10
-                              Decorate 121(g_tTex1du1) DescriptorSet 0
+                              Decorate 23 DescriptorSet 0
                               Decorate 121(g_tTex1du1) Binding 1
-                              Decorate 217(g_tTex2di1) DescriptorSet 0
+                              Decorate 121(g_tTex1du1) DescriptorSet 0
                               Decorate 217(g_tTex2di1) Binding 2
-                              Decorate 308(g_tTex2du1) DescriptorSet 0
+                              Decorate 217(g_tTex2di1) DescriptorSet 0
                               Decorate 308(g_tTex2du1) Binding 3
-                              Decorate 399(g_tTex3di1) DescriptorSet 0
+                              Decorate 308(g_tTex2du1) DescriptorSet 0
                               Decorate 399(g_tTex3di1) Binding 4
-                              Decorate 490(g_tTex3du1) DescriptorSet 0
+                              Decorate 399(g_tTex3di1) DescriptorSet 0
                               Decorate 490(g_tTex3du1) Binding 5
-                              Decorate 581(g_tTex1di1a) DescriptorSet 0
+                              Decorate 490(g_tTex3du1) DescriptorSet 0
                               Decorate 581(g_tTex1di1a) Binding 6
-                              Decorate 670(g_tTex1du1a) DescriptorSet 0
+                              Decorate 581(g_tTex1di1a) DescriptorSet 0
                               Decorate 670(g_tTex1du1a) Binding 7
-                              Decorate 931(g_tBuffI) DescriptorSet 0
+                              Decorate 670(g_tTex1du1a) DescriptorSet 0
                               Decorate 931(g_tBuffI) Binding 8
-                              Decorate 1020(g_tBuffU) DescriptorSet 0
+                              Decorate 931(g_tBuffI) DescriptorSet 0
                               Decorate 1020(g_tBuffU) Binding 9
+                              Decorate 1020(g_tBuffU) DescriptorSet 0
                               Decorate 1117(@entryPointOutput.Color) Location 0
-                              Decorate 1122(g_sSamp) DescriptorSet 0
                               Decorate 1122(g_sSamp) Binding 0
-                              Decorate 1125(g_tTex1df1) DescriptorSet 0
+                              Decorate 1122(g_sSamp) DescriptorSet 0
                               Decorate 1125(g_tTex1df1) Binding 0
-                              Decorate 1128(g_tTex2df1) DescriptorSet 0
+                              Decorate 1125(g_tTex1df1) DescriptorSet 0
                               Decorate 1128(g_tTex2df1) Binding 0
-                              Decorate 1131(g_tTex3df1) DescriptorSet 0
+                              Decorate 1128(g_tTex2df1) DescriptorSet 0
                               Decorate 1131(g_tTex3df1) Binding 0
-                              Decorate 1134(g_tTex1df1a) DescriptorSet 0
+                              Decorate 1131(g_tTex3df1) DescriptorSet 0
                               Decorate 1134(g_tTex1df1a) Binding 0
-                              Decorate 1137(g_tTex2df1a) DescriptorSet 0
+                              Decorate 1134(g_tTex1df1a) DescriptorSet 0
                               Decorate 1137(g_tTex2df1a) Binding 0
-                              Decorate 1140(g_tTex2di1a) DescriptorSet 0
+                              Decorate 1137(g_tTex2df1a) DescriptorSet 0
                               Decorate 1140(g_tTex2di1a) Binding 0
-                              Decorate 1143(g_tTex2du1a) DescriptorSet 0
+                              Decorate 1140(g_tTex2di1a) DescriptorSet 0
                               Decorate 1143(g_tTex2du1a) Binding 0
-                              Decorate 1146(g_tBuffF) DescriptorSet 0
+                              Decorate 1143(g_tTex2du1a) DescriptorSet 0
                               Decorate 1146(g_tBuffF) Binding 0
+                              Decorate 1146(g_tBuffF) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.rw.bracket.frag.out b/Test/baseResults/hlsl.rw.bracket.frag.out
index 02ed3799..f199c620 100644
--- a/Test/baseResults/hlsl.rw.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.bracket.frag.out
@@ -1880,6 +1880,7 @@ gl_FragCoord origin is upper left
                               Name 600  "g_tTex2df4a"
                               Name 603  "g_tTex2di4a"
                               Name 606  "g_tTex2du4a"
+                              Decorate 63($Global) Block
                               MemberDecorate 63($Global) 0 Offset 0
                               MemberDecorate 63($Global) 1 Offset 8
                               MemberDecorate 63($Global) 2 Offset 16
@@ -1891,42 +1892,41 @@ gl_FragCoord origin is upper left
                               MemberDecorate 63($Global) 8 Offset 96
                               MemberDecorate 63($Global) 9 Offset 112
                               MemberDecorate 63($Global) 10 Offset 128
-                              Decorate 63($Global) Block
-                              Decorate 65 DescriptorSet 0
                               Decorate 65 Binding 9
-                              Decorate 75(g_tTex1df4) DescriptorSet 0
+                              Decorate 65 DescriptorSet 0
                               Decorate 75(g_tTex1df4) Binding 0
-                              Decorate 89(g_tTex1di4) DescriptorSet 0
+                              Decorate 75(g_tTex1df4) DescriptorSet 0
                               Decorate 89(g_tTex1di4) Binding 1
-                              Decorate 97(g_tTex1du4) DescriptorSet 0
+                              Decorate 89(g_tTex1di4) DescriptorSet 0
                               Decorate 97(g_tTex1du4) Binding 2
-                              Decorate 105(g_tTex2df4) DescriptorSet 0
+                              Decorate 97(g_tTex1du4) DescriptorSet 0
                               Decorate 105(g_tTex2df4) Binding 3
-                              Decorate 115(g_tTex2di4) DescriptorSet 0
+                              Decorate 105(g_tTex2df4) DescriptorSet 0
                               Decorate 115(g_tTex2di4) Binding 4
-                              Decorate 123(g_tTex2du4) DescriptorSet 0
+                              Decorate 115(g_tTex2di4) DescriptorSet 0
                               Decorate 123(g_tTex2du4) Binding 5
-                              Decorate 131(g_tTex3df4) DescriptorSet 0
+                              Decorate 123(g_tTex2du4) DescriptorSet 0
                               Decorate 131(g_tTex3df4) Binding 6
-                              Decorate 141(g_tTex3di4) DescriptorSet 0
+                              Decorate 131(g_tTex3df4) DescriptorSet 0
                               Decorate 141(g_tTex3di4) Binding 7
-                              Decorate 149(g_tTex3du4) DescriptorSet 0
+                              Decorate 141(g_tTex3di4) DescriptorSet 0
                               Decorate 149(g_tTex3du4) Binding 8
+                              Decorate 149(g_tTex3du4) DescriptorSet 0
                               Decorate 583(@entryPointOutput.Color) Location 0
-                              Decorate 588(g_sSamp) DescriptorSet 0
                               Decorate 588(g_sSamp) Binding 0
-                              Decorate 591(g_tTex1df4a) DescriptorSet 0
+                              Decorate 588(g_sSamp) DescriptorSet 0
                               Decorate 591(g_tTex1df4a) Binding 0
-                              Decorate 594(g_tTex1di4a) DescriptorSet 0
+                              Decorate 591(g_tTex1df4a) DescriptorSet 0
                               Decorate 594(g_tTex1di4a) Binding 0
-                              Decorate 597(g_tTex1du4a) DescriptorSet 0
+                              Decorate 594(g_tTex1di4a) DescriptorSet 0
                               Decorate 597(g_tTex1du4a) Binding 0
-                              Decorate 600(g_tTex2df4a) DescriptorSet 0
+                              Decorate 597(g_tTex1du4a) DescriptorSet 0
                               Decorate 600(g_tTex2df4a) Binding 0
-                              Decorate 603(g_tTex2di4a) DescriptorSet 0
+                              Decorate 600(g_tTex2df4a) DescriptorSet 0
                               Decorate 603(g_tTex2di4a) Binding 0
-                              Decorate 606(g_tTex2du4a) DescriptorSet 0
+                              Decorate 603(g_tTex2di4a) DescriptorSet 0
                               Decorate 606(g_tTex2du4a) Binding 0
+                              Decorate 606(g_tTex2du4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out
index 558bf424..a4f37730 100644
--- a/Test/baseResults/hlsl.rw.register.frag.out
+++ b/Test/baseResults/hlsl.rw.register.frag.out
@@ -119,10 +119,10 @@ gl_FragCoord origin is upper left
                               Name 27  "g_tBuf1du1"
                               Name 33  "psout"
                               Name 42  "@entryPointOutput.Color"
-                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 16(g_tTex1df1) Binding 2
-                              Decorate 27(g_tBuf1du1) DescriptorSet 0
+                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 27(g_tBuf1du1) Binding 3
+                              Decorate 27(g_tBuf1du1) DescriptorSet 0
                               Decorate 42(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
index f2bef19a..20c7600f 100644
--- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
@@ -1826,6 +1826,7 @@ gl_FragCoord origin is upper left
                               Name 600  "g_tTex2df1a"
                               Name 603  "g_tTex2di1a"
                               Name 606  "g_tTex2du1a"
+                              Decorate 59($Global) Block
                               MemberDecorate 59($Global) 0 Offset 0
                               MemberDecorate 59($Global) 1 Offset 8
                               MemberDecorate 59($Global) 2 Offset 16
@@ -1837,42 +1838,41 @@ gl_FragCoord origin is upper left
                               MemberDecorate 59($Global) 8 Offset 96
                               MemberDecorate 59($Global) 9 Offset 100
                               MemberDecorate 59($Global) 10 Offset 104
-                              Decorate 59($Global) Block
-                              Decorate 61 DescriptorSet 0
                               Decorate 61 Binding 10
-                              Decorate 70(g_tTex1df1) DescriptorSet 0
+                              Decorate 61 DescriptorSet 0
                               Decorate 70(g_tTex1df1) Binding 1
-                              Decorate 85(g_tTex1di1) DescriptorSet 0
+                              Decorate 70(g_tTex1df1) DescriptorSet 0
                               Decorate 85(g_tTex1di1) Binding 2
-                              Decorate 94(g_tTex1du1) DescriptorSet 0
+                              Decorate 85(g_tTex1di1) DescriptorSet 0
                               Decorate 94(g_tTex1du1) Binding 3
-                              Decorate 104(g_tTex2df1) DescriptorSet 0
+                              Decorate 94(g_tTex1du1) DescriptorSet 0
                               Decorate 104(g_tTex2df1) Binding 4
-                              Decorate 115(g_tTex2di1) DescriptorSet 0
+                              Decorate 104(g_tTex2df1) DescriptorSet 0
                               Decorate 115(g_tTex2di1) Binding 5
-                              Decorate 124(g_tTex2du1) DescriptorSet 0
+                              Decorate 115(g_tTex2di1) DescriptorSet 0
                               Decorate 124(g_tTex2du1) Binding 6
-                              Decorate 133(g_tTex3df1) DescriptorSet 0
+                              Decorate 124(g_tTex2du1) DescriptorSet 0
                               Decorate 133(g_tTex3df1) Binding 7
-                              Decorate 144(g_tTex3di1) DescriptorSet 0
+                              Decorate 133(g_tTex3df1) DescriptorSet 0
                               Decorate 144(g_tTex3di1) Binding 8
-                              Decorate 153(g_tTex3du1) DescriptorSet 0
+                              Decorate 144(g_tTex3di1) DescriptorSet 0
                               Decorate 153(g_tTex3du1) Binding 9
+                              Decorate 153(g_tTex3du1) DescriptorSet 0
                               Decorate 583(@entryPointOutput.Color) Location 0
-                              Decorate 588(g_sSamp) DescriptorSet 0
                               Decorate 588(g_sSamp) Binding 0
-                              Decorate 591(g_tTex1df1a) DescriptorSet 0
+                              Decorate 588(g_sSamp) DescriptorSet 0
                               Decorate 591(g_tTex1df1a) Binding 0
-                              Decorate 594(g_tTex1di1a) DescriptorSet 0
+                              Decorate 591(g_tTex1df1a) DescriptorSet 0
                               Decorate 594(g_tTex1di1a) Binding 0
-                              Decorate 597(g_tTex1du1a) DescriptorSet 0
+                              Decorate 594(g_tTex1di1a) DescriptorSet 0
                               Decorate 597(g_tTex1du1a) Binding 0
-                              Decorate 600(g_tTex2df1a) DescriptorSet 0
+                              Decorate 597(g_tTex1du1a) DescriptorSet 0
                               Decorate 600(g_tTex2df1a) Binding 0
-                              Decorate 603(g_tTex2di1a) DescriptorSet 0
+                              Decorate 600(g_tTex2df1a) DescriptorSet 0
                               Decorate 603(g_tTex2di1a) Binding 0
-                              Decorate 606(g_tTex2du1a) DescriptorSet 0
+                              Decorate 603(g_tTex2di1a) DescriptorSet 0
                               Decorate 606(g_tTex2du1a) Binding 0
+                              Decorate 606(g_tTex2du1a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.rw.swizzle.frag.out b/Test/baseResults/hlsl.rw.swizzle.frag.out
index 5121cebd..28788f9d 100644
--- a/Test/baseResults/hlsl.rw.swizzle.frag.out
+++ b/Test/baseResults/hlsl.rw.swizzle.frag.out
@@ -223,11 +223,11 @@ gl_FragCoord origin is upper left
                               Name 46  "storeTemp"
                               Name 58  "@entryPointOutput"
                               Name 62  "buf"
-                              Decorate 35(rwtx) DescriptorSet 0
                               Decorate 35(rwtx) Binding 0
+                              Decorate 35(rwtx) DescriptorSet 0
                               Decorate 58(@entryPointOutput) Location 0
-                              Decorate 62(buf) DescriptorSet 0
                               Decorate 62(buf) Binding 0
+                              Decorate 62(buf) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
index a0c639bf..304ff9c0 100644
--- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
@@ -1845,6 +1845,7 @@ gl_FragCoord origin is upper left
                               Name 704  "g_tTex2df2a"
                               Name 707  "g_tTex2di2a"
                               Name 710  "g_tTex2du2a"
+                              Decorate 64($Global) Block
                               MemberDecorate 64($Global) 0 Offset 0
                               MemberDecorate 64($Global) 1 Offset 8
                               MemberDecorate 64($Global) 2 Offset 16
@@ -1856,42 +1857,41 @@ gl_FragCoord origin is upper left
                               MemberDecorate 64($Global) 8 Offset 96
                               MemberDecorate 64($Global) 9 Offset 104
                               MemberDecorate 64($Global) 10 Offset 112
-                              Decorate 64($Global) Block
-                              Decorate 66 DescriptorSet 0
                               Decorate 66 Binding 10
-                              Decorate 76(g_tTex1df2) DescriptorSet 0
+                              Decorate 66 DescriptorSet 0
                               Decorate 76(g_tTex1df2) Binding 1
-                              Decorate 96(g_tTex1di2) DescriptorSet 0
+                              Decorate 76(g_tTex1df2) DescriptorSet 0
                               Decorate 96(g_tTex1di2) Binding 2
-                              Decorate 107(g_tTex1du2) DescriptorSet 0
+                              Decorate 96(g_tTex1di2) DescriptorSet 0
                               Decorate 107(g_tTex1du2) Binding 3
-                              Decorate 119(g_tTex2df2) DescriptorSet 0
+                              Decorate 107(g_tTex1du2) DescriptorSet 0
                               Decorate 119(g_tTex2df2) Binding 4
-                              Decorate 130(g_tTex2di2) DescriptorSet 0
+                              Decorate 119(g_tTex2df2) DescriptorSet 0
                               Decorate 130(g_tTex2di2) Binding 5
-                              Decorate 141(g_tTex2du2) DescriptorSet 0
+                              Decorate 130(g_tTex2di2) DescriptorSet 0
                               Decorate 141(g_tTex2du2) Binding 6
-                              Decorate 152(g_tTex3df2) DescriptorSet 0
+                              Decorate 141(g_tTex2du2) DescriptorSet 0
                               Decorate 152(g_tTex3df2) Binding 7
-                              Decorate 165(g_tTex3di2) DescriptorSet 0
+                              Decorate 152(g_tTex3df2) DescriptorSet 0
                               Decorate 165(g_tTex3di2) Binding 8
-                              Decorate 176(g_tTex3du2) DescriptorSet 0
+                              Decorate 165(g_tTex3di2) DescriptorSet 0
                               Decorate 176(g_tTex3du2) Binding 9
+                              Decorate 176(g_tTex3du2) DescriptorSet 0
                               Decorate 687(@entryPointOutput.Color) Location 0
-                              Decorate 692(g_sSamp) DescriptorSet 0
                               Decorate 692(g_sSamp) Binding 0
-                              Decorate 695(g_tTex1df2a) DescriptorSet 0
+                              Decorate 692(g_sSamp) DescriptorSet 0
                               Decorate 695(g_tTex1df2a) Binding 0
-                              Decorate 698(g_tTex1di2a) DescriptorSet 0
+                              Decorate 695(g_tTex1df2a) DescriptorSet 0
                               Decorate 698(g_tTex1di2a) Binding 0
-                              Decorate 701(g_tTex1du2a) DescriptorSet 0
+                              Decorate 698(g_tTex1di2a) DescriptorSet 0
                               Decorate 701(g_tTex1du2a) Binding 0
-                              Decorate 704(g_tTex2df2a) DescriptorSet 0
+                              Decorate 701(g_tTex1du2a) DescriptorSet 0
                               Decorate 704(g_tTex2df2a) Binding 0
-                              Decorate 707(g_tTex2di2a) DescriptorSet 0
+                              Decorate 704(g_tTex2df2a) DescriptorSet 0
                               Decorate 707(g_tTex2di2a) Binding 0
-                              Decorate 710(g_tTex2du2a) DescriptorSet 0
+                              Decorate 707(g_tTex2di2a) DescriptorSet 0
                               Decorate 710(g_tTex2du2a) Binding 0
+                              Decorate 710(g_tTex2du2a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out
index 1acca183..eb5ed7b9 100644
--- a/Test/baseResults/hlsl.sample.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out
@@ -363,30 +363,30 @@ using depth_any
                               Name 138  "@entryPointOutput.Color"
                               Name 142  "@entryPointOutput.Depth"
                               Name 145  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 2
-                              Decorate 49(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 49(g_tTex1du4) Binding 3
-                              Decorate 60(g_tTex2df4) DescriptorSet 0
+                              Decorate 49(g_tTex1du4) DescriptorSet 0
                               Decorate 60(g_tTex2df4) Binding 4
-                              Decorate 71(g_tTex2di4) DescriptorSet 0
+                              Decorate 60(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) Binding 5
-                              Decorate 82(g_tTex2du4) DescriptorSet 0
+                              Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 82(g_tTex2du4) Binding 6
-                              Decorate 94(g_tTexcdf4) DescriptorSet 0
+                              Decorate 82(g_tTex2du4) DescriptorSet 0
                               Decorate 94(g_tTexcdf4) Binding 7
-                              Decorate 104(g_tTexcdi4) DescriptorSet 0
+                              Decorate 94(g_tTexcdf4) DescriptorSet 0
                               Decorate 104(g_tTexcdi4) Binding 8
-                              Decorate 114(g_tTexcdu4) DescriptorSet 0
+                              Decorate 104(g_tTexcdi4) DescriptorSet 0
                               Decorate 114(g_tTexcdu4) Binding 9
+                              Decorate 114(g_tTexcdu4) DescriptorSet 0
                               Decorate 138(@entryPointOutput.Color) Location 0
                               Decorate 142(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 145(g_tTex1df4a) DescriptorSet 0
                               Decorate 145(g_tTex1df4a) Binding 1
+                              Decorate 145(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
index e3063178..8e2739d9 100644
--- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
@@ -612,40 +612,40 @@ using depth_any
                               Name 195  "g_sSamp2d"
                               Name 196  "g_sSamp2D_b"
                               Name 197  "g_tTex1df4a"
-                              Decorate 45(g_tTex1df4) DescriptorSet 0
                               Decorate 45(g_tTex1df4) Binding 0
-                              Decorate 49(g_sSamp) DescriptorSet 0
+                              Decorate 45(g_tTex1df4) DescriptorSet 0
                               Decorate 49(g_sSamp) Binding 0
-                              Decorate 60(g_tTex1di4) DescriptorSet 0
+                              Decorate 49(g_sSamp) DescriptorSet 0
                               Decorate 60(g_tTex1di4) Binding 2
-                              Decorate 73(g_tTex1du4) DescriptorSet 0
+                              Decorate 60(g_tTex1di4) DescriptorSet 0
                               Decorate 73(g_tTex1du4) Binding 3
-                              Decorate 83(g_tTex2df4) DescriptorSet 0
+                              Decorate 73(g_tTex1du4) DescriptorSet 0
                               Decorate 83(g_tTex2df4) Binding 4
-                              Decorate 94(g_tTex2di4) DescriptorSet 0
+                              Decorate 83(g_tTex2df4) DescriptorSet 0
                               Decorate 94(g_tTex2di4) Binding 5
-                              Decorate 105(g_tTex2du4) DescriptorSet 0
+                              Decorate 94(g_tTex2di4) DescriptorSet 0
                               Decorate 105(g_tTex2du4) Binding 6
-                              Decorate 117(g_tTex3df4) DescriptorSet 0
+                              Decorate 105(g_tTex2du4) DescriptorSet 0
                               Decorate 117(g_tTex3df4) Binding 7
-                              Decorate 128(g_tTex3di4) DescriptorSet 0
+                              Decorate 117(g_tTex3df4) DescriptorSet 0
                               Decorate 128(g_tTex3di4) Binding 8
-                              Decorate 138(g_tTex3du4) DescriptorSet 0
+                              Decorate 128(g_tTex3di4) DescriptorSet 0
                               Decorate 138(g_tTex3du4) Binding 9
-                              Decorate 151(g_tTexcdf4) DescriptorSet 0
+                              Decorate 138(g_tTex3du4) DescriptorSet 0
                               Decorate 151(g_tTexcdf4) Binding 10
-                              Decorate 160(g_tTexcdi4) DescriptorSet 0
+                              Decorate 151(g_tTexcdf4) DescriptorSet 0
                               Decorate 160(g_tTexcdi4) Binding 11
-                              Decorate 169(g_tTexcdu4) DescriptorSet 0
+                              Decorate 160(g_tTexcdi4) DescriptorSet 0
                               Decorate 169(g_tTexcdu4) Binding 12
+                              Decorate 169(g_tTexcdu4) DescriptorSet 0
                               Decorate 188(@entryPointOutput.Color) Location 0
                               Decorate 192(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 195(g_sSamp2d) DescriptorSet 0
                               Decorate 195(g_sSamp2d) Binding 0
-                              Decorate 196(g_sSamp2D_b) DescriptorSet 0
+                              Decorate 195(g_sSamp2d) DescriptorSet 0
                               Decorate 196(g_sSamp2D_b) Binding 0
-                              Decorate 197(g_tTex1df4a) DescriptorSet 0
+                              Decorate 196(g_sSamp2D_b) DescriptorSet 0
                               Decorate 197(g_tTex1df4a) Binding 1
+                              Decorate 197(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.sample.dx9.frag.out b/Test/baseResults/hlsl.sample.dx9.frag.out
index 04eb9d36..f1a6e0ae 100644
--- a/Test/baseResults/hlsl.sample.dx9.frag.out
+++ b/Test/baseResults/hlsl.sample.dx9.frag.out
@@ -413,16 +413,16 @@ using depth_any
                               Name 125  "flattenTemp"
                               Name 128  "@entryPointOutput.Color"
                               Name 132  "@entryPointOutput.Depth"
-                              Decorate 20(g_sam) DescriptorSet 0
                               Decorate 20(g_sam) Binding 0
-                              Decorate 32(g_sam1D) DescriptorSet 0
+                              Decorate 20(g_sam) DescriptorSet 0
                               Decorate 32(g_sam1D) Binding 1
-                              Decorate 38(g_sam2D) DescriptorSet 0
+                              Decorate 32(g_sam1D) DescriptorSet 0
                               Decorate 38(g_sam2D) Binding 2
-                              Decorate 48(g_sam3D) DescriptorSet 0
+                              Decorate 38(g_sam2D) DescriptorSet 0
                               Decorate 48(g_sam3D) Binding 3
-                              Decorate 58(g_samCube) DescriptorSet 0
+                              Decorate 48(g_sam3D) DescriptorSet 0
                               Decorate 58(g_samCube) Binding 4
+                              Decorate 58(g_samCube) DescriptorSet 0
                               Decorate 128(@entryPointOutput.Color) Location 0
                               Decorate 132(@entryPointOutput.Depth) BuiltIn FragDepth
                3:             TypeVoid
diff --git a/Test/baseResults/hlsl.sample.dx9.vert.out b/Test/baseResults/hlsl.sample.dx9.vert.out
index 59878a99..2b6520a0 100644
--- a/Test/baseResults/hlsl.sample.dx9.vert.out
+++ b/Test/baseResults/hlsl.sample.dx9.vert.out
@@ -180,10 +180,10 @@ Shader version: 500
                               Name 36  "g_sam2D"
                               Name 49  "vsout"
                               Name 61  "@entryPointOutput.Pos"
-                              Decorate 20(g_sam) DescriptorSet 0
                               Decorate 20(g_sam) Binding 0
-                              Decorate 36(g_sam2D) DescriptorSet 0
+                              Decorate 20(g_sam) DescriptorSet 0
                               Decorate 36(g_sam2D) Binding 1
+                              Decorate 36(g_sam2D) DescriptorSet 0
                               Decorate 61(@entryPointOutput.Pos) BuiltIn Position
                3:             TypeVoid
                4:             TypeFunction 3
diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
index 0a351b43..f2be35ae 100644
--- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
@@ -407,36 +407,36 @@ using depth_any
                               Name 154  "g_tTexcdf4"
                               Name 157  "g_tTexcdi4"
                               Name 160  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4) Binding 2
-                              Decorate 46(g_tTex1du4) DescriptorSet 0
+                              Decorate 33(g_tTex1di4) DescriptorSet 0
                               Decorate 46(g_tTex1du4) Binding 3
-                              Decorate 56(g_tTex2df4) DescriptorSet 0
+                              Decorate 46(g_tTex1du4) DescriptorSet 0
                               Decorate 56(g_tTex2df4) Binding 4
-                              Decorate 70(g_tTex2di4) DescriptorSet 0
+                              Decorate 56(g_tTex2df4) DescriptorSet 0
                               Decorate 70(g_tTex2di4) Binding 5
-                              Decorate 82(g_tTex2du4) DescriptorSet 0
+                              Decorate 70(g_tTex2di4) DescriptorSet 0
                               Decorate 82(g_tTex2du4) Binding 6
-                              Decorate 96(g_tTex3df4) DescriptorSet 0
+                              Decorate 82(g_tTex2du4) DescriptorSet 0
                               Decorate 96(g_tTex3df4) Binding 7
-                              Decorate 109(g_tTex3di4) DescriptorSet 0
+                              Decorate 96(g_tTex3df4) DescriptorSet 0
                               Decorate 109(g_tTex3di4) Binding 8
-                              Decorate 120(g_tTex3du4) DescriptorSet 0
+                              Decorate 109(g_tTex3di4) DescriptorSet 0
                               Decorate 120(g_tTex3du4) Binding 9
+                              Decorate 120(g_tTex3du4) DescriptorSet 0
                               Decorate 144(@entryPointOutput.Color) Location 0
                               Decorate 148(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 151(g_tTex1df4a) DescriptorSet 0
                               Decorate 151(g_tTex1df4a) Binding 1
-                              Decorate 154(g_tTexcdf4) DescriptorSet 0
+                              Decorate 151(g_tTex1df4a) DescriptorSet 0
                               Decorate 154(g_tTexcdf4) Binding 0
-                              Decorate 157(g_tTexcdi4) DescriptorSet 0
+                              Decorate 154(g_tTexcdf4) DescriptorSet 0
                               Decorate 157(g_tTexcdi4) Binding 0
-                              Decorate 160(g_tTexcdu4) DescriptorSet 0
+                              Decorate 157(g_tTexcdi4) DescriptorSet 0
                               Decorate 160(g_tTexcdu4) Binding 0
+                              Decorate 160(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
index 0770e0ba..08da1837 100644
--- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
@@ -308,24 +308,24 @@ using depth_any
                               Name 110  "@entryPointOutput.Color"
                               Name 114  "@entryPointOutput.Depth"
                               Name 117  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex1di4) Binding 2
-                              Decorate 51(g_tTex1du4) DescriptorSet 0
+                              Decorate 36(g_tTex1di4) DescriptorSet 0
                               Decorate 51(g_tTex1du4) Binding 3
-                              Decorate 63(g_tTex2df4) DescriptorSet 0
+                              Decorate 51(g_tTex1du4) DescriptorSet 0
                               Decorate 63(g_tTex2df4) Binding 4
-                              Decorate 76(g_tTex2di4) DescriptorSet 0
+                              Decorate 63(g_tTex2df4) DescriptorSet 0
                               Decorate 76(g_tTex2di4) Binding 5
-                              Decorate 87(g_tTex2du4) DescriptorSet 0
+                              Decorate 76(g_tTex2di4) DescriptorSet 0
                               Decorate 87(g_tTex2du4) Binding 6
+                              Decorate 87(g_tTex2du4) DescriptorSet 0
                               Decorate 110(@entryPointOutput.Color) Location 0
                               Decorate 114(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 117(g_tTex1df4a) DescriptorSet 0
                               Decorate 117(g_tTex1df4a) Binding 1
+                              Decorate 117(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
index ea0e4e24..71c0162b 100644
--- a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
@@ -179,16 +179,16 @@ gl_FragCoord origin is upper left
                               Name 53  "g_tTex1df4"
                               Name 59  "psout"
                               Name 69  "@entryPointOutput.Color"
-                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 16(g_tTex1df1) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 30(g_tTex1df2) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 30(g_tTex1df2) Binding 2
-                              Decorate 42(g_tTex1df3) DescriptorSet 0
+                              Decorate 30(g_tTex1df2) DescriptorSet 0
                               Decorate 42(g_tTex1df3) Binding 3
-                              Decorate 53(g_tTex1df4) DescriptorSet 0
+                              Decorate 42(g_tTex1df3) DescriptorSet 0
                               Decorate 53(g_tTex1df4) Binding 4
+                              Decorate 53(g_tTex1df4) DescriptorSet 0
                               Decorate 69(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
index f59fc811..dd18bbe7 100644
--- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
@@ -399,30 +399,30 @@ using depth_any
                               Name 138  "@entryPointOutput.Color"
                               Name 142  "@entryPointOutput.Depth"
                               Name 145  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex1di4) Binding 2
-                              Decorate 50(g_tTex1du4) DescriptorSet 0
+                              Decorate 36(g_tTex1di4) DescriptorSet 0
                               Decorate 50(g_tTex1du4) Binding 3
-                              Decorate 61(g_tTex2df4) DescriptorSet 0
+                              Decorate 50(g_tTex1du4) DescriptorSet 0
                               Decorate 61(g_tTex2df4) Binding 4
-                              Decorate 72(g_tTex2di4) DescriptorSet 0
+                              Decorate 61(g_tTex2df4) DescriptorSet 0
                               Decorate 72(g_tTex2di4) Binding 5
-                              Decorate 82(g_tTex2du4) DescriptorSet 0
+                              Decorate 72(g_tTex2di4) DescriptorSet 0
                               Decorate 82(g_tTex2du4) Binding 6
-                              Decorate 94(g_tTexcdf4) DescriptorSet 0
+                              Decorate 82(g_tTex2du4) DescriptorSet 0
                               Decorate 94(g_tTexcdf4) Binding 7
-                              Decorate 104(g_tTexcdi4) DescriptorSet 0
+                              Decorate 94(g_tTexcdf4) DescriptorSet 0
                               Decorate 104(g_tTexcdi4) Binding 8
-                              Decorate 114(g_tTexcdu4) DescriptorSet 0
+                              Decorate 104(g_tTexcdi4) DescriptorSet 0
                               Decorate 114(g_tTexcdu4) Binding 9
+                              Decorate 114(g_tTexcdu4) DescriptorSet 0
                               Decorate 138(@entryPointOutput.Color) Location 0
                               Decorate 142(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 145(g_tTex1df4a) DescriptorSet 0
                               Decorate 145(g_tTex1df4a) Binding 1
+                              Decorate 145(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
index 919be719..4b95ca2a 100644
--- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
@@ -470,36 +470,36 @@ using depth_any
                               Name 162  "@entryPointOutput.Color"
                               Name 166  "@entryPointOutput.Depth"
                               Name 169  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4) Binding 2
-                              Decorate 46(g_tTex1du4) DescriptorSet 0
+                              Decorate 33(g_tTex1di4) DescriptorSet 0
                               Decorate 46(g_tTex1du4) Binding 3
-                              Decorate 56(g_tTex2df4) DescriptorSet 0
+                              Decorate 46(g_tTex1du4) DescriptorSet 0
                               Decorate 56(g_tTex2df4) Binding 4
-                              Decorate 67(g_tTex2di4) DescriptorSet 0
+                              Decorate 56(g_tTex2df4) DescriptorSet 0
                               Decorate 67(g_tTex2di4) Binding 5
-                              Decorate 78(g_tTex2du4) DescriptorSet 0
+                              Decorate 67(g_tTex2di4) DescriptorSet 0
                               Decorate 78(g_tTex2du4) Binding 6
-                              Decorate 89(g_tTex3df4) DescriptorSet 0
+                              Decorate 78(g_tTex2du4) DescriptorSet 0
                               Decorate 89(g_tTex3df4) Binding 7
-                              Decorate 100(g_tTex3di4) DescriptorSet 0
+                              Decorate 89(g_tTex3df4) DescriptorSet 0
                               Decorate 100(g_tTex3di4) Binding 8
-                              Decorate 110(g_tTex3du4) DescriptorSet 0
+                              Decorate 100(g_tTex3di4) DescriptorSet 0
                               Decorate 110(g_tTex3du4) Binding 9
-                              Decorate 123(g_tTexcdf4) DescriptorSet 0
+                              Decorate 110(g_tTex3du4) DescriptorSet 0
                               Decorate 123(g_tTexcdf4) Binding 10
-                              Decorate 132(g_tTexcdi4) DescriptorSet 0
+                              Decorate 123(g_tTexcdf4) DescriptorSet 0
                               Decorate 132(g_tTexcdi4) Binding 11
-                              Decorate 141(g_tTexcdu4) DescriptorSet 0
+                              Decorate 132(g_tTexcdi4) DescriptorSet 0
                               Decorate 141(g_tTexcdu4) Binding 12
+                              Decorate 141(g_tTexcdu4) DescriptorSet 0
                               Decorate 162(@entryPointOutput.Color) Location 0
                               Decorate 166(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 169(g_tTex1df4a) DescriptorSet 0
                               Decorate 169(g_tTex1df4a) Binding 1
+                              Decorate 169(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
index 5b297577..f6403a0e 100644
--- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
@@ -443,36 +443,36 @@ using depth_any
                               Name 154  "g_tTexcdf4"
                               Name 157  "g_tTexcdi4"
                               Name 160  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 34(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 34(g_tTex1di4) Binding 2
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 34(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 3
-                              Decorate 57(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 57(g_tTex2df4) Binding 4
-                              Decorate 71(g_tTex2di4) DescriptorSet 0
+                              Decorate 57(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) Binding 5
-                              Decorate 83(g_tTex2du4) DescriptorSet 0
+                              Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 83(g_tTex2du4) Binding 6
-                              Decorate 96(g_tTex3df4) DescriptorSet 0
+                              Decorate 83(g_tTex2du4) DescriptorSet 0
                               Decorate 96(g_tTex3df4) Binding 7
-                              Decorate 109(g_tTex3di4) DescriptorSet 0
+                              Decorate 96(g_tTex3df4) DescriptorSet 0
                               Decorate 109(g_tTex3di4) Binding 8
-                              Decorate 120(g_tTex3du4) DescriptorSet 0
+                              Decorate 109(g_tTex3di4) DescriptorSet 0
                               Decorate 120(g_tTex3du4) Binding 9
+                              Decorate 120(g_tTex3du4) DescriptorSet 0
                               Decorate 144(@entryPointOutput.Color) Location 0
                               Decorate 148(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 151(g_tTex1df4a) DescriptorSet 0
                               Decorate 151(g_tTex1df4a) Binding 1
-                              Decorate 154(g_tTexcdf4) DescriptorSet 0
+                              Decorate 151(g_tTex1df4a) DescriptorSet 0
                               Decorate 154(g_tTexcdf4) Binding 0
-                              Decorate 157(g_tTexcdi4) DescriptorSet 0
+                              Decorate 154(g_tTexcdf4) DescriptorSet 0
                               Decorate 157(g_tTexcdi4) Binding 0
-                              Decorate 160(g_tTexcdu4) DescriptorSet 0
+                              Decorate 157(g_tTexcdi4) DescriptorSet 0
                               Decorate 160(g_tTexcdu4) Binding 0
+                              Decorate 160(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
index c3114a1b..ba31124f 100644
--- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
@@ -332,24 +332,24 @@ using depth_any
                               Name 110  "@entryPointOutput.Color"
                               Name 114  "@entryPointOutput.Depth"
                               Name 117  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 37(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 37(g_tTex1di4) Binding 2
-                              Decorate 52(g_tTex1du4) DescriptorSet 0
+                              Decorate 37(g_tTex1di4) DescriptorSet 0
                               Decorate 52(g_tTex1du4) Binding 3
-                              Decorate 64(g_tTex2df4) DescriptorSet 0
+                              Decorate 52(g_tTex1du4) DescriptorSet 0
                               Decorate 64(g_tTex2df4) Binding 4
-                              Decorate 77(g_tTex2di4) DescriptorSet 0
+                              Decorate 64(g_tTex2df4) DescriptorSet 0
                               Decorate 77(g_tTex2di4) Binding 5
-                              Decorate 87(g_tTex2du4) DescriptorSet 0
+                              Decorate 77(g_tTex2di4) DescriptorSet 0
                               Decorate 87(g_tTex2du4) Binding 6
+                              Decorate 87(g_tTex2du4) DescriptorSet 0
                               Decorate 110(@entryPointOutput.Color) Location 0
                               Decorate 114(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 117(g_tTex1df4a) DescriptorSet 0
                               Decorate 117(g_tTex1df4a) Binding 1
+                              Decorate 117(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
index cde1d519..7ecb39f1 100644
--- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
@@ -451,52 +451,52 @@ Validation failed
                               Name 187  "g_tTexcdf4"
                               Name 190  "g_tTexcdi4"
                               Name 193  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 39(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 39(g_tTex1di4a) Binding 2
-                              Decorate 53(g_tTex1du4a) DescriptorSet 0
+                              Decorate 39(g_tTex1di4a) DescriptorSet 0
                               Decorate 53(g_tTex1du4a) Binding 3
-                              Decorate 66(g_tTex2df4a) DescriptorSet 0
+                              Decorate 53(g_tTex1du4a) DescriptorSet 0
                               Decorate 66(g_tTex2df4a) Binding 4
-                              Decorate 82(g_tTex2di4a) DescriptorSet 0
+                              Decorate 66(g_tTex2df4a) DescriptorSet 0
                               Decorate 82(g_tTex2di4a) Binding 5
-                              Decorate 96(g_tTex2du4a) DescriptorSet 0
+                              Decorate 82(g_tTex2di4a) DescriptorSet 0
                               Decorate 96(g_tTex2du4a) Binding 6
-                              Decorate 110(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 96(g_tTex2du4a) DescriptorSet 0
                               Decorate 110(g_tTexcdf4a) Binding 7
-                              Decorate 121(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 110(g_tTexcdf4a) DescriptorSet 0
                               Decorate 121(g_tTexcdi4a) Binding 8
-                              Decorate 130(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 121(g_tTexcdi4a) DescriptorSet 0
                               Decorate 130(g_tTexcdu4a) Binding 9
+                              Decorate 130(g_tTexcdu4a) DescriptorSet 0
                               Decorate 151(@entryPointOutput.Color) Location 0
                               Decorate 155(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 160(g_tTex1df4) DescriptorSet 0
                               Decorate 160(g_tTex1df4) Binding 0
-                              Decorate 163(g_tTex1di4) DescriptorSet 0
+                              Decorate 160(g_tTex1df4) DescriptorSet 0
                               Decorate 163(g_tTex1di4) Binding 0
-                              Decorate 166(g_tTex1du4) DescriptorSet 0
+                              Decorate 163(g_tTex1di4) DescriptorSet 0
                               Decorate 166(g_tTex1du4) Binding 0
-                              Decorate 169(g_tTex2df4) DescriptorSet 0
+                              Decorate 166(g_tTex1du4) DescriptorSet 0
                               Decorate 169(g_tTex2df4) Binding 0
-                              Decorate 172(g_tTex2di4) DescriptorSet 0
+                              Decorate 169(g_tTex2df4) DescriptorSet 0
                               Decorate 172(g_tTex2di4) Binding 0
-                              Decorate 175(g_tTex2du4) DescriptorSet 0
+                              Decorate 172(g_tTex2di4) DescriptorSet 0
                               Decorate 175(g_tTex2du4) Binding 0
-                              Decorate 178(g_tTex3df4) DescriptorSet 0
+                              Decorate 175(g_tTex2du4) DescriptorSet 0
                               Decorate 178(g_tTex3df4) Binding 0
-                              Decorate 181(g_tTex3di4) DescriptorSet 0
+                              Decorate 178(g_tTex3df4) DescriptorSet 0
                               Decorate 181(g_tTex3di4) Binding 0
-                              Decorate 184(g_tTex3du4) DescriptorSet 0
+                              Decorate 181(g_tTex3di4) DescriptorSet 0
                               Decorate 184(g_tTex3du4) Binding 0
-                              Decorate 187(g_tTexcdf4) DescriptorSet 0
+                              Decorate 184(g_tTex3du4) DescriptorSet 0
                               Decorate 187(g_tTexcdf4) Binding 0
-                              Decorate 190(g_tTexcdi4) DescriptorSet 0
+                              Decorate 187(g_tTexcdf4) DescriptorSet 0
                               Decorate 190(g_tTexcdi4) Binding 0
-                              Decorate 193(g_tTexcdu4) DescriptorSet 0
+                              Decorate 190(g_tTexcdi4) DescriptorSet 0
                               Decorate 193(g_tTexcdu4) Binding 0
+                              Decorate 193(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
index fde1b58c..a355f880 100644
--- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
@@ -433,52 +433,52 @@ Validation failed
                               Name 191  "g_tTexcdf4a"
                               Name 194  "g_tTexcdi4a"
                               Name 197  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 34(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 34(g_tTex1di4) Binding 1
-                              Decorate 46(g_tTex1du4) DescriptorSet 0
+                              Decorate 34(g_tTex1di4) DescriptorSet 0
                               Decorate 46(g_tTex1du4) Binding 2
-                              Decorate 57(g_tTex2df4) DescriptorSet 0
+                              Decorate 46(g_tTex1du4) DescriptorSet 0
                               Decorate 57(g_tTex2df4) Binding 3
-                              Decorate 73(g_tTex2di4) DescriptorSet 0
+                              Decorate 57(g_tTex2df4) DescriptorSet 0
                               Decorate 73(g_tTex2di4) Binding 4
-                              Decorate 86(g_tTex2du4) DescriptorSet 0
+                              Decorate 73(g_tTex2di4) DescriptorSet 0
                               Decorate 86(g_tTex2du4) Binding 5
-                              Decorate 99(g_tTexcdf4) DescriptorSet 0
+                              Decorate 86(g_tTex2du4) DescriptorSet 0
                               Decorate 99(g_tTexcdf4) Binding 6
-                              Decorate 115(g_tTexcdi4) DescriptorSet 0
+                              Decorate 99(g_tTexcdf4) DescriptorSet 0
                               Decorate 115(g_tTexcdi4) Binding 7
-                              Decorate 129(g_tTexcdu4) DescriptorSet 0
+                              Decorate 115(g_tTexcdi4) DescriptorSet 0
                               Decorate 129(g_tTexcdu4) Binding 8
+                              Decorate 129(g_tTexcdu4) DescriptorSet 0
                               Decorate 155(@entryPointOutput.Color) Location 0
                               Decorate 159(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 164(g_tTex3df4) DescriptorSet 0
                               Decorate 164(g_tTex3df4) Binding 0
-                              Decorate 167(g_tTex3di4) DescriptorSet 0
+                              Decorate 164(g_tTex3df4) DescriptorSet 0
                               Decorate 167(g_tTex3di4) Binding 0
-                              Decorate 170(g_tTex3du4) DescriptorSet 0
+                              Decorate 167(g_tTex3di4) DescriptorSet 0
                               Decorate 170(g_tTex3du4) Binding 0
-                              Decorate 173(g_tTex1df4a) DescriptorSet 0
+                              Decorate 170(g_tTex3du4) DescriptorSet 0
                               Decorate 173(g_tTex1df4a) Binding 0
-                              Decorate 176(g_tTex1di4a) DescriptorSet 0
+                              Decorate 173(g_tTex1df4a) DescriptorSet 0
                               Decorate 176(g_tTex1di4a) Binding 0
-                              Decorate 179(g_tTex1du4a) DescriptorSet 0
+                              Decorate 176(g_tTex1di4a) DescriptorSet 0
                               Decorate 179(g_tTex1du4a) Binding 0
-                              Decorate 182(g_tTex2df4a) DescriptorSet 0
+                              Decorate 179(g_tTex1du4a) DescriptorSet 0
                               Decorate 182(g_tTex2df4a) Binding 0
-                              Decorate 185(g_tTex2di4a) DescriptorSet 0
+                              Decorate 182(g_tTex2df4a) DescriptorSet 0
                               Decorate 185(g_tTex2di4a) Binding 0
-                              Decorate 188(g_tTex2du4a) DescriptorSet 0
+                              Decorate 185(g_tTex2di4a) DescriptorSet 0
                               Decorate 188(g_tTex2du4a) Binding 0
-                              Decorate 191(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 188(g_tTex2du4a) DescriptorSet 0
                               Decorate 191(g_tTexcdf4a) Binding 0
-                              Decorate 194(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 191(g_tTexcdf4a) DescriptorSet 0
                               Decorate 194(g_tTexcdi4a) Binding 0
-                              Decorate 197(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 194(g_tTexcdi4a) DescriptorSet 0
                               Decorate 197(g_tTexcdu4a) Binding 0
+                              Decorate 197(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmp.dualmode.frag.out b/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
index 7f17e900..da2b024a 100644
--- a/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
@@ -102,14 +102,14 @@ gl_FragCoord origin is upper left
                               Name 29  "g_tTex"
                               Name 31  "g_sSamp"
                               Name 41  "@entryPointOutput"
-                              Decorate 13(g_tTex) DescriptorSet 0
                               Decorate 13(g_tTex) Binding 3
-                              Decorate 17(g_sSampCmp) DescriptorSet 0
+                              Decorate 13(g_tTex) DescriptorSet 0
                               Decorate 17(g_sSampCmp) Binding 1
-                              Decorate 29(g_tTex) DescriptorSet 0
+                              Decorate 17(g_sSampCmp) DescriptorSet 0
                               Decorate 29(g_tTex) Binding 3
-                              Decorate 31(g_sSamp) DescriptorSet 0
+                              Decorate 29(g_tTex) DescriptorSet 0
                               Decorate 31(g_sSamp) Binding 0
+                              Decorate 31(g_sSamp) DescriptorSet 0
                               Decorate 41(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
index cc1b8581..f5286378 100644
--- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
@@ -376,52 +376,52 @@ Validation failed
                               Name 160  "g_tTexcdf4a"
                               Name 163  "g_tTexcdi4a"
                               Name 166  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 1
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 2
-                              Decorate 58(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 58(g_tTex2df4) Binding 3
-                              Decorate 77(g_tTex2di4) DescriptorSet 0
+                              Decorate 58(g_tTex2df4) DescriptorSet 0
                               Decorate 77(g_tTex2di4) Binding 4
-                              Decorate 90(g_tTex2du4) DescriptorSet 0
+                              Decorate 77(g_tTex2di4) DescriptorSet 0
                               Decorate 90(g_tTex2du4) Binding 5
+                              Decorate 90(g_tTex2du4) DescriptorSet 0
                               Decorate 115(@entryPointOutput.Color) Location 0
                               Decorate 119(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 124(g_tTex3df4) DescriptorSet 0
                               Decorate 124(g_tTex3df4) Binding 0
-                              Decorate 127(g_tTex3di4) DescriptorSet 0
+                              Decorate 124(g_tTex3df4) DescriptorSet 0
                               Decorate 127(g_tTex3di4) Binding 0
-                              Decorate 130(g_tTex3du4) DescriptorSet 0
+                              Decorate 127(g_tTex3di4) DescriptorSet 0
                               Decorate 130(g_tTex3du4) Binding 0
-                              Decorate 133(g_tTexcdf4) DescriptorSet 0
+                              Decorate 130(g_tTex3du4) DescriptorSet 0
                               Decorate 133(g_tTexcdf4) Binding 0
-                              Decorate 136(g_tTexcdi4) DescriptorSet 0
+                              Decorate 133(g_tTexcdf4) DescriptorSet 0
                               Decorate 136(g_tTexcdi4) Binding 0
-                              Decorate 139(g_tTexcdu4) DescriptorSet 0
+                              Decorate 136(g_tTexcdi4) DescriptorSet 0
                               Decorate 139(g_tTexcdu4) Binding 0
-                              Decorate 142(g_tTex1df4a) DescriptorSet 0
+                              Decorate 139(g_tTexcdu4) DescriptorSet 0
                               Decorate 142(g_tTex1df4a) Binding 0
-                              Decorate 145(g_tTex1di4a) DescriptorSet 0
+                              Decorate 142(g_tTex1df4a) DescriptorSet 0
                               Decorate 145(g_tTex1di4a) Binding 0
-                              Decorate 148(g_tTex1du4a) DescriptorSet 0
+                              Decorate 145(g_tTex1di4a) DescriptorSet 0
                               Decorate 148(g_tTex1du4a) Binding 0
-                              Decorate 151(g_tTex2df4a) DescriptorSet 0
+                              Decorate 148(g_tTex1du4a) DescriptorSet 0
                               Decorate 151(g_tTex2df4a) Binding 0
-                              Decorate 154(g_tTex2di4a) DescriptorSet 0
+                              Decorate 151(g_tTex2df4a) DescriptorSet 0
                               Decorate 154(g_tTex2di4a) Binding 0
-                              Decorate 157(g_tTex2du4a) DescriptorSet 0
+                              Decorate 154(g_tTex2di4a) DescriptorSet 0
                               Decorate 157(g_tTex2du4a) Binding 0
-                              Decorate 160(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 157(g_tTex2du4a) DescriptorSet 0
                               Decorate 160(g_tTexcdf4a) Binding 0
-                              Decorate 163(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 160(g_tTexcdf4a) DescriptorSet 0
                               Decorate 163(g_tTexcdi4a) Binding 0
-                              Decorate 166(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 163(g_tTexcdi4a) DescriptorSet 0
                               Decorate 166(g_tTexcdu4a) Binding 0
+                              Decorate 166(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
index 9d8413c9..0500534c 100644
--- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
@@ -388,52 +388,52 @@ Validation failed
                               Name 171  "g_tTexcdf4a"
                               Name 174  "g_tTexcdi4a"
                               Name 177  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 40(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 40(g_tTex1di4a) Binding 2
-                              Decorate 54(g_tTex1du4a) DescriptorSet 0
+                              Decorate 40(g_tTex1di4a) DescriptorSet 0
                               Decorate 54(g_tTex1du4a) Binding 3
-                              Decorate 67(g_tTex2df4a) DescriptorSet 0
+                              Decorate 54(g_tTex1du4a) DescriptorSet 0
                               Decorate 67(g_tTex2df4a) Binding 4
-                              Decorate 86(g_tTex2di4a) DescriptorSet 0
+                              Decorate 67(g_tTex2df4a) DescriptorSet 0
                               Decorate 86(g_tTex2di4a) Binding 5
-                              Decorate 100(g_tTex2du4a) DescriptorSet 0
+                              Decorate 86(g_tTex2di4a) DescriptorSet 0
                               Decorate 100(g_tTex2du4a) Binding 6
+                              Decorate 100(g_tTex2du4a) DescriptorSet 0
                               Decorate 126(@entryPointOutput.Color) Location 0
                               Decorate 130(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 135(g_tTex1df4) DescriptorSet 0
                               Decorate 135(g_tTex1df4) Binding 0
-                              Decorate 138(g_tTex1di4) DescriptorSet 0
+                              Decorate 135(g_tTex1df4) DescriptorSet 0
                               Decorate 138(g_tTex1di4) Binding 0
-                              Decorate 141(g_tTex1du4) DescriptorSet 0
+                              Decorate 138(g_tTex1di4) DescriptorSet 0
                               Decorate 141(g_tTex1du4) Binding 0
-                              Decorate 144(g_tTex2df4) DescriptorSet 0
+                              Decorate 141(g_tTex1du4) DescriptorSet 0
                               Decorate 144(g_tTex2df4) Binding 0
-                              Decorate 147(g_tTex2di4) DescriptorSet 0
+                              Decorate 144(g_tTex2df4) DescriptorSet 0
                               Decorate 147(g_tTex2di4) Binding 0
-                              Decorate 150(g_tTex2du4) DescriptorSet 0
+                              Decorate 147(g_tTex2di4) DescriptorSet 0
                               Decorate 150(g_tTex2du4) Binding 0
-                              Decorate 153(g_tTex3df4) DescriptorSet 0
+                              Decorate 150(g_tTex2du4) DescriptorSet 0
                               Decorate 153(g_tTex3df4) Binding 0
-                              Decorate 156(g_tTex3di4) DescriptorSet 0
+                              Decorate 153(g_tTex3df4) DescriptorSet 0
                               Decorate 156(g_tTex3di4) Binding 0
-                              Decorate 159(g_tTex3du4) DescriptorSet 0
+                              Decorate 156(g_tTex3di4) DescriptorSet 0
                               Decorate 159(g_tTex3du4) Binding 0
-                              Decorate 162(g_tTexcdf4) DescriptorSet 0
+                              Decorate 159(g_tTex3du4) DescriptorSet 0
                               Decorate 162(g_tTexcdf4) Binding 0
-                              Decorate 165(g_tTexcdi4) DescriptorSet 0
+                              Decorate 162(g_tTexcdf4) DescriptorSet 0
                               Decorate 165(g_tTexcdi4) Binding 0
-                              Decorate 168(g_tTexcdu4) DescriptorSet 0
+                              Decorate 165(g_tTexcdi4) DescriptorSet 0
                               Decorate 168(g_tTexcdu4) Binding 0
-                              Decorate 171(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 168(g_tTexcdu4) DescriptorSet 0
                               Decorate 171(g_tTexcdf4a) Binding 0
-                              Decorate 174(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 171(g_tTexcdf4a) DescriptorSet 0
                               Decorate 174(g_tTexcdi4a) Binding 0
-                              Decorate 177(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 174(g_tTexcdi4a) DescriptorSet 0
                               Decorate 177(g_tTexcdu4a) Binding 0
+                              Decorate 177(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
index b9adf6fe..66b5092a 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
@@ -487,52 +487,52 @@ Validation failed
                               Name 188  "g_tTexcdf4"
                               Name 191  "g_tTexcdi4"
                               Name 194  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 40(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 40(g_tTex1di4a) Binding 2
-                              Decorate 54(g_tTex1du4a) DescriptorSet 0
+                              Decorate 40(g_tTex1di4a) DescriptorSet 0
                               Decorate 54(g_tTex1du4a) Binding 3
-                              Decorate 67(g_tTex2df4a) DescriptorSet 0
+                              Decorate 54(g_tTex1du4a) DescriptorSet 0
                               Decorate 67(g_tTex2df4a) Binding 4
-                              Decorate 83(g_tTex2di4a) DescriptorSet 0
+                              Decorate 67(g_tTex2df4a) DescriptorSet 0
                               Decorate 83(g_tTex2di4a) Binding 5
-                              Decorate 97(g_tTex2du4a) DescriptorSet 0
+                              Decorate 83(g_tTex2di4a) DescriptorSet 0
                               Decorate 97(g_tTex2du4a) Binding 6
-                              Decorate 111(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 97(g_tTex2du4a) DescriptorSet 0
                               Decorate 111(g_tTexcdf4a) Binding 7
-                              Decorate 122(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 111(g_tTexcdf4a) DescriptorSet 0
                               Decorate 122(g_tTexcdi4a) Binding 8
-                              Decorate 131(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 122(g_tTexcdi4a) DescriptorSet 0
                               Decorate 131(g_tTexcdu4a) Binding 9
+                              Decorate 131(g_tTexcdu4a) DescriptorSet 0
                               Decorate 152(@entryPointOutput.Color) Location 0
                               Decorate 156(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 161(g_tTex1df4) DescriptorSet 0
                               Decorate 161(g_tTex1df4) Binding 0
-                              Decorate 164(g_tTex1di4) DescriptorSet 0
+                              Decorate 161(g_tTex1df4) DescriptorSet 0
                               Decorate 164(g_tTex1di4) Binding 0
-                              Decorate 167(g_tTex1du4) DescriptorSet 0
+                              Decorate 164(g_tTex1di4) DescriptorSet 0
                               Decorate 167(g_tTex1du4) Binding 0
-                              Decorate 170(g_tTex2df4) DescriptorSet 0
+                              Decorate 167(g_tTex1du4) DescriptorSet 0
                               Decorate 170(g_tTex2df4) Binding 0
-                              Decorate 173(g_tTex2di4) DescriptorSet 0
+                              Decorate 170(g_tTex2df4) DescriptorSet 0
                               Decorate 173(g_tTex2di4) Binding 0
-                              Decorate 176(g_tTex2du4) DescriptorSet 0
+                              Decorate 173(g_tTex2di4) DescriptorSet 0
                               Decorate 176(g_tTex2du4) Binding 0
-                              Decorate 179(g_tTex3df4) DescriptorSet 0
+                              Decorate 176(g_tTex2du4) DescriptorSet 0
                               Decorate 179(g_tTex3df4) Binding 0
-                              Decorate 182(g_tTex3di4) DescriptorSet 0
+                              Decorate 179(g_tTex3df4) DescriptorSet 0
                               Decorate 182(g_tTex3di4) Binding 0
-                              Decorate 185(g_tTex3du4) DescriptorSet 0
+                              Decorate 182(g_tTex3di4) DescriptorSet 0
                               Decorate 185(g_tTex3du4) Binding 0
-                              Decorate 188(g_tTexcdf4) DescriptorSet 0
+                              Decorate 185(g_tTex3du4) DescriptorSet 0
                               Decorate 188(g_tTexcdf4) Binding 0
-                              Decorate 191(g_tTexcdi4) DescriptorSet 0
+                              Decorate 188(g_tTexcdf4) DescriptorSet 0
                               Decorate 191(g_tTexcdi4) Binding 0
-                              Decorate 194(g_tTexcdu4) DescriptorSet 0
+                              Decorate 191(g_tTexcdi4) DescriptorSet 0
                               Decorate 194(g_tTexcdu4) Binding 0
+                              Decorate 194(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
index 6807d995..c833b51a 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
@@ -469,52 +469,52 @@ Validation failed
                               Name 192  "g_tTexcdf4a"
                               Name 195  "g_tTexcdi4a"
                               Name 198  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 1
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 2
-                              Decorate 58(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 58(g_tTex2df4) Binding 3
-                              Decorate 74(g_tTex2di4) DescriptorSet 0
+                              Decorate 58(g_tTex2df4) DescriptorSet 0
                               Decorate 74(g_tTex2di4) Binding 4
-                              Decorate 87(g_tTex2du4) DescriptorSet 0
+                              Decorate 74(g_tTex2di4) DescriptorSet 0
                               Decorate 87(g_tTex2du4) Binding 5
-                              Decorate 100(g_tTexcdf4) DescriptorSet 0
+                              Decorate 87(g_tTex2du4) DescriptorSet 0
                               Decorate 100(g_tTexcdf4) Binding 6
-                              Decorate 116(g_tTexcdi4) DescriptorSet 0
+                              Decorate 100(g_tTexcdf4) DescriptorSet 0
                               Decorate 116(g_tTexcdi4) Binding 7
-                              Decorate 130(g_tTexcdu4) DescriptorSet 0
+                              Decorate 116(g_tTexcdi4) DescriptorSet 0
                               Decorate 130(g_tTexcdu4) Binding 8
+                              Decorate 130(g_tTexcdu4) DescriptorSet 0
                               Decorate 156(@entryPointOutput.Color) Location 0
                               Decorate 160(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 165(g_tTex3df4) DescriptorSet 0
                               Decorate 165(g_tTex3df4) Binding 0
-                              Decorate 168(g_tTex3di4) DescriptorSet 0
+                              Decorate 165(g_tTex3df4) DescriptorSet 0
                               Decorate 168(g_tTex3di4) Binding 0
-                              Decorate 171(g_tTex3du4) DescriptorSet 0
+                              Decorate 168(g_tTex3di4) DescriptorSet 0
                               Decorate 171(g_tTex3du4) Binding 0
-                              Decorate 174(g_tTex1df4a) DescriptorSet 0
+                              Decorate 171(g_tTex3du4) DescriptorSet 0
                               Decorate 174(g_tTex1df4a) Binding 0
-                              Decorate 177(g_tTex1di4a) DescriptorSet 0
+                              Decorate 174(g_tTex1df4a) DescriptorSet 0
                               Decorate 177(g_tTex1di4a) Binding 0
-                              Decorate 180(g_tTex1du4a) DescriptorSet 0
+                              Decorate 177(g_tTex1di4a) DescriptorSet 0
                               Decorate 180(g_tTex1du4a) Binding 0
-                              Decorate 183(g_tTex2df4a) DescriptorSet 0
+                              Decorate 180(g_tTex1du4a) DescriptorSet 0
                               Decorate 183(g_tTex2df4a) Binding 0
-                              Decorate 186(g_tTex2di4a) DescriptorSet 0
+                              Decorate 183(g_tTex2df4a) DescriptorSet 0
                               Decorate 186(g_tTex2di4a) Binding 0
-                              Decorate 189(g_tTex2du4a) DescriptorSet 0
+                              Decorate 186(g_tTex2di4a) DescriptorSet 0
                               Decorate 189(g_tTex2du4a) Binding 0
-                              Decorate 192(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 189(g_tTex2du4a) DescriptorSet 0
                               Decorate 192(g_tTexcdf4a) Binding 0
-                              Decorate 195(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 192(g_tTexcdf4a) DescriptorSet 0
                               Decorate 195(g_tTexcdi4a) Binding 0
-                              Decorate 198(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 195(g_tTexcdi4a) DescriptorSet 0
                               Decorate 198(g_tTexcdu4a) Binding 0
+                              Decorate 198(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
index 338a5e71..70d2bd77 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
@@ -400,52 +400,52 @@ Validation failed
                               Name 161  "g_tTexcdf4a"
                               Name 164  "g_tTexcdi4a"
                               Name 167  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex1di4) Binding 1
-                              Decorate 48(g_tTex1du4) DescriptorSet 0
+                              Decorate 36(g_tTex1di4) DescriptorSet 0
                               Decorate 48(g_tTex1du4) Binding 2
-                              Decorate 59(g_tTex2df4) DescriptorSet 0
+                              Decorate 48(g_tTex1du4) DescriptorSet 0
                               Decorate 59(g_tTex2df4) Binding 3
-                              Decorate 78(g_tTex2di4) DescriptorSet 0
+                              Decorate 59(g_tTex2df4) DescriptorSet 0
                               Decorate 78(g_tTex2di4) Binding 4
-                              Decorate 91(g_tTex2du4) DescriptorSet 0
+                              Decorate 78(g_tTex2di4) DescriptorSet 0
                               Decorate 91(g_tTex2du4) Binding 5
+                              Decorate 91(g_tTex2du4) DescriptorSet 0
                               Decorate 116(@entryPointOutput.Color) Location 0
                               Decorate 120(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 125(g_tTex3df4) DescriptorSet 0
                               Decorate 125(g_tTex3df4) Binding 0
-                              Decorate 128(g_tTex3di4) DescriptorSet 0
+                              Decorate 125(g_tTex3df4) DescriptorSet 0
                               Decorate 128(g_tTex3di4) Binding 0
-                              Decorate 131(g_tTex3du4) DescriptorSet 0
+                              Decorate 128(g_tTex3di4) DescriptorSet 0
                               Decorate 131(g_tTex3du4) Binding 0
-                              Decorate 134(g_tTexcdf4) DescriptorSet 0
+                              Decorate 131(g_tTex3du4) DescriptorSet 0
                               Decorate 134(g_tTexcdf4) Binding 0
-                              Decorate 137(g_tTexcdi4) DescriptorSet 0
+                              Decorate 134(g_tTexcdf4) DescriptorSet 0
                               Decorate 137(g_tTexcdi4) Binding 0
-                              Decorate 140(g_tTexcdu4) DescriptorSet 0
+                              Decorate 137(g_tTexcdi4) DescriptorSet 0
                               Decorate 140(g_tTexcdu4) Binding 0
-                              Decorate 143(g_tTex1df4a) DescriptorSet 0
+                              Decorate 140(g_tTexcdu4) DescriptorSet 0
                               Decorate 143(g_tTex1df4a) Binding 0
-                              Decorate 146(g_tTex1di4a) DescriptorSet 0
+                              Decorate 143(g_tTex1df4a) DescriptorSet 0
                               Decorate 146(g_tTex1di4a) Binding 0
-                              Decorate 149(g_tTex1du4a) DescriptorSet 0
+                              Decorate 146(g_tTex1di4a) DescriptorSet 0
                               Decorate 149(g_tTex1du4a) Binding 0
-                              Decorate 152(g_tTex2df4a) DescriptorSet 0
+                              Decorate 149(g_tTex1du4a) DescriptorSet 0
                               Decorate 152(g_tTex2df4a) Binding 0
-                              Decorate 155(g_tTex2di4a) DescriptorSet 0
+                              Decorate 152(g_tTex2df4a) DescriptorSet 0
                               Decorate 155(g_tTex2di4a) Binding 0
-                              Decorate 158(g_tTex2du4a) DescriptorSet 0
+                              Decorate 155(g_tTex2di4a) DescriptorSet 0
                               Decorate 158(g_tTex2du4a) Binding 0
-                              Decorate 161(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 158(g_tTex2du4a) DescriptorSet 0
                               Decorate 161(g_tTexcdf4a) Binding 0
-                              Decorate 164(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 161(g_tTexcdf4a) DescriptorSet 0
                               Decorate 164(g_tTexcdi4a) Binding 0
-                              Decorate 167(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 164(g_tTexcdi4a) DescriptorSet 0
                               Decorate 167(g_tTexcdu4a) Binding 0
+                              Decorate 167(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
index 4b68c90f..c3fbf0d1 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
@@ -412,52 +412,52 @@ Validation failed
                               Name 172  "g_tTexcdf4a"
                               Name 175  "g_tTexcdi4a"
                               Name 178  "g_tTexcdu4a"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 41(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 41(g_tTex1di4a) Binding 2
-                              Decorate 55(g_tTex1du4a) DescriptorSet 0
+                              Decorate 41(g_tTex1di4a) DescriptorSet 0
                               Decorate 55(g_tTex1du4a) Binding 3
-                              Decorate 68(g_tTex2df4a) DescriptorSet 0
+                              Decorate 55(g_tTex1du4a) DescriptorSet 0
                               Decorate 68(g_tTex2df4a) Binding 4
-                              Decorate 87(g_tTex2di4a) DescriptorSet 0
+                              Decorate 68(g_tTex2df4a) DescriptorSet 0
                               Decorate 87(g_tTex2di4a) Binding 5
-                              Decorate 101(g_tTex2du4a) DescriptorSet 0
+                              Decorate 87(g_tTex2di4a) DescriptorSet 0
                               Decorate 101(g_tTex2du4a) Binding 6
+                              Decorate 101(g_tTex2du4a) DescriptorSet 0
                               Decorate 127(@entryPointOutput.Color) Location 0
                               Decorate 131(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 136(g_tTex1df4) DescriptorSet 0
                               Decorate 136(g_tTex1df4) Binding 0
-                              Decorate 139(g_tTex1di4) DescriptorSet 0
+                              Decorate 136(g_tTex1df4) DescriptorSet 0
                               Decorate 139(g_tTex1di4) Binding 0
-                              Decorate 142(g_tTex1du4) DescriptorSet 0
+                              Decorate 139(g_tTex1di4) DescriptorSet 0
                               Decorate 142(g_tTex1du4) Binding 0
-                              Decorate 145(g_tTex2df4) DescriptorSet 0
+                              Decorate 142(g_tTex1du4) DescriptorSet 0
                               Decorate 145(g_tTex2df4) Binding 0
-                              Decorate 148(g_tTex2di4) DescriptorSet 0
+                              Decorate 145(g_tTex2df4) DescriptorSet 0
                               Decorate 148(g_tTex2di4) Binding 0
-                              Decorate 151(g_tTex2du4) DescriptorSet 0
+                              Decorate 148(g_tTex2di4) DescriptorSet 0
                               Decorate 151(g_tTex2du4) Binding 0
-                              Decorate 154(g_tTex3df4) DescriptorSet 0
+                              Decorate 151(g_tTex2du4) DescriptorSet 0
                               Decorate 154(g_tTex3df4) Binding 0
-                              Decorate 157(g_tTex3di4) DescriptorSet 0
+                              Decorate 154(g_tTex3df4) DescriptorSet 0
                               Decorate 157(g_tTex3di4) Binding 0
-                              Decorate 160(g_tTex3du4) DescriptorSet 0
+                              Decorate 157(g_tTex3di4) DescriptorSet 0
                               Decorate 160(g_tTex3du4) Binding 0
-                              Decorate 163(g_tTexcdf4) DescriptorSet 0
+                              Decorate 160(g_tTex3du4) DescriptorSet 0
                               Decorate 163(g_tTexcdf4) Binding 0
-                              Decorate 166(g_tTexcdi4) DescriptorSet 0
+                              Decorate 163(g_tTexcdf4) DescriptorSet 0
                               Decorate 166(g_tTexcdi4) Binding 0
-                              Decorate 169(g_tTexcdu4) DescriptorSet 0
+                              Decorate 166(g_tTexcdi4) DescriptorSet 0
                               Decorate 169(g_tTexcdu4) Binding 0
-                              Decorate 172(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 169(g_tTexcdu4) DescriptorSet 0
                               Decorate 172(g_tTexcdf4a) Binding 0
-                              Decorate 175(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 172(g_tTexcdf4a) DescriptorSet 0
                               Decorate 175(g_tTexcdi4a) Binding 0
-                              Decorate 178(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 175(g_tTexcdi4a) DescriptorSet 0
                               Decorate 178(g_tTexcdu4a) Binding 0
+                              Decorate 178(g_tTexcdu4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
index a2e58bd6..b70b0bff 100644
--- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
@@ -471,30 +471,30 @@ using depth_any
                               Name 132  "@entryPointOutput.Color"
                               Name 136  "@entryPointOutput.Depth"
                               Name 139  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 37(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 37(g_tTex1di4) Binding 2
-                              Decorate 49(g_tTex1du4) DescriptorSet 0
+                              Decorate 37(g_tTex1di4) DescriptorSet 0
                               Decorate 49(g_tTex1du4) Binding 3
-                              Decorate 58(g_tTex2df4) DescriptorSet 0
+                              Decorate 49(g_tTex1du4) DescriptorSet 0
                               Decorate 58(g_tTex2df4) Binding 4
-                              Decorate 71(g_tTex2di4) DescriptorSet 0
+                              Decorate 58(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) Binding 5
-                              Decorate 80(g_tTex2du4) DescriptorSet 0
+                              Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 80(g_tTex2du4) Binding 6
-                              Decorate 89(g_tTexcdf4) DescriptorSet 0
+                              Decorate 80(g_tTex2du4) DescriptorSet 0
                               Decorate 89(g_tTexcdf4) Binding 7
-                              Decorate 102(g_tTexcdi4) DescriptorSet 0
+                              Decorate 89(g_tTexcdf4) DescriptorSet 0
                               Decorate 102(g_tTexcdi4) Binding 8
-                              Decorate 111(g_tTexcdu4) DescriptorSet 0
+                              Decorate 102(g_tTexcdi4) DescriptorSet 0
                               Decorate 111(g_tTexcdu4) Binding 9
+                              Decorate 111(g_tTexcdu4) DescriptorSet 0
                               Decorate 132(@entryPointOutput.Color) Location 0
                               Decorate 136(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 139(g_tTex1df4a) DescriptorSet 0
                               Decorate 139(g_tTex1df4a) Binding 1
+                              Decorate 139(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
index 09bfbdf3..b17306d0 100644
--- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
@@ -578,36 +578,36 @@ using depth_any
                               Name 167  "@entryPointOutput.Color"
                               Name 171  "@entryPointOutput.Depth"
                               Name 174  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 34(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 34(g_tTex1di4) Binding 2
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 34(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 3
-                              Decorate 57(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 57(g_tTex2df4) Binding 4
-                              Decorate 69(g_tTex2di4) DescriptorSet 0
+                              Decorate 57(g_tTex2df4) DescriptorSet 0
                               Decorate 69(g_tTex2di4) Binding 5
-                              Decorate 80(g_tTex2du4) DescriptorSet 0
+                              Decorate 69(g_tTex2di4) DescriptorSet 0
                               Decorate 80(g_tTex2du4) Binding 6
-                              Decorate 92(g_tTex3df4) DescriptorSet 0
+                              Decorate 80(g_tTex2du4) DescriptorSet 0
                               Decorate 92(g_tTex3df4) Binding 7
-                              Decorate 105(g_tTex3di4) DescriptorSet 0
+                              Decorate 92(g_tTex3df4) DescriptorSet 0
                               Decorate 105(g_tTex3di4) Binding 8
-                              Decorate 115(g_tTex3du4) DescriptorSet 0
+                              Decorate 105(g_tTex3di4) DescriptorSet 0
                               Decorate 115(g_tTex3du4) Binding 9
-                              Decorate 128(g_tTexcdf4) DescriptorSet 0
+                              Decorate 115(g_tTex3du4) DescriptorSet 0
                               Decorate 128(g_tTexcdf4) Binding 10
-                              Decorate 137(g_tTexcdi4) DescriptorSet 0
+                              Decorate 128(g_tTexcdf4) DescriptorSet 0
                               Decorate 137(g_tTexcdi4) Binding 11
-                              Decorate 146(g_tTexcdu4) DescriptorSet 0
+                              Decorate 137(g_tTexcdi4) DescriptorSet 0
                               Decorate 146(g_tTexcdu4) Binding 12
+                              Decorate 146(g_tTexcdu4) DescriptorSet 0
                               Decorate 167(@entryPointOutput.Color) Location 0
                               Decorate 171(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 174(g_tTex1df4a) DescriptorSet 0
                               Decorate 174(g_tTex1df4a) Binding 1
+                              Decorate 174(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
index f63d9e8e..902500cd 100644
--- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
@@ -535,35 +535,35 @@ Shader version: 500
                               Name 153  "vsout"
                               Name 162  "@entryPointOutput.Pos"
                               Name 165  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 34(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 34(g_tTex1di4) Binding 2
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 34(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 3
-                              Decorate 57(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 57(g_tTex2df4) Binding 4
-                              Decorate 69(g_tTex2di4) DescriptorSet 0
+                              Decorate 57(g_tTex2df4) DescriptorSet 0
                               Decorate 69(g_tTex2di4) Binding 5
-                              Decorate 80(g_tTex2du4) DescriptorSet 0
+                              Decorate 69(g_tTex2di4) DescriptorSet 0
                               Decorate 80(g_tTex2du4) Binding 6
-                              Decorate 92(g_tTex3df4) DescriptorSet 0
+                              Decorate 80(g_tTex2du4) DescriptorSet 0
                               Decorate 92(g_tTex3df4) Binding 7
-                              Decorate 105(g_tTex3di4) DescriptorSet 0
+                              Decorate 92(g_tTex3df4) DescriptorSet 0
                               Decorate 105(g_tTex3di4) Binding 8
-                              Decorate 115(g_tTex3du4) DescriptorSet 0
+                              Decorate 105(g_tTex3di4) DescriptorSet 0
                               Decorate 115(g_tTex3du4) Binding 9
-                              Decorate 128(g_tTexcdf4) DescriptorSet 0
+                              Decorate 115(g_tTex3du4) DescriptorSet 0
                               Decorate 128(g_tTexcdf4) Binding 10
-                              Decorate 137(g_tTexcdi4) DescriptorSet 0
+                              Decorate 128(g_tTexcdf4) DescriptorSet 0
                               Decorate 137(g_tTexcdi4) Binding 11
-                              Decorate 146(g_tTexcdu4) DescriptorSet 0
+                              Decorate 137(g_tTexcdi4) DescriptorSet 0
                               Decorate 146(g_tTexcdu4) Binding 12
+                              Decorate 146(g_tTexcdu4) DescriptorSet 0
                               Decorate 162(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 165(g_tTex1df4a) DescriptorSet 0
                               Decorate 165(g_tTex1df4a) Binding 1
+                              Decorate 165(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
index 3180e7a3..63c94219 100644
--- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
@@ -515,36 +515,36 @@ using depth_any
                               Name 159  "g_tTexcdf4"
                               Name 162  "g_tTexcdi4"
                               Name 165  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 35(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 35(g_tTex1di4) Binding 2
-                              Decorate 48(g_tTex1du4) DescriptorSet 0
+                              Decorate 35(g_tTex1di4) DescriptorSet 0
                               Decorate 48(g_tTex1du4) Binding 3
-                              Decorate 58(g_tTex2df4) DescriptorSet 0
+                              Decorate 48(g_tTex1du4) DescriptorSet 0
                               Decorate 58(g_tTex2df4) Binding 4
-                              Decorate 73(g_tTex2di4) DescriptorSet 0
+                              Decorate 58(g_tTex2df4) DescriptorSet 0
                               Decorate 73(g_tTex2di4) Binding 5
-                              Decorate 85(g_tTex2du4) DescriptorSet 0
+                              Decorate 73(g_tTex2di4) DescriptorSet 0
                               Decorate 85(g_tTex2du4) Binding 6
-                              Decorate 99(g_tTex3df4) DescriptorSet 0
+                              Decorate 85(g_tTex2du4) DescriptorSet 0
                               Decorate 99(g_tTex3df4) Binding 7
-                              Decorate 114(g_tTex3di4) DescriptorSet 0
+                              Decorate 99(g_tTex3df4) DescriptorSet 0
                               Decorate 114(g_tTex3di4) Binding 8
-                              Decorate 125(g_tTex3du4) DescriptorSet 0
+                              Decorate 114(g_tTex3di4) DescriptorSet 0
                               Decorate 125(g_tTex3du4) Binding 9
+                              Decorate 125(g_tTex3du4) DescriptorSet 0
                               Decorate 149(@entryPointOutput.Color) Location 0
                               Decorate 153(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 156(g_tTex1df4a) DescriptorSet 0
                               Decorate 156(g_tTex1df4a) Binding 1
-                              Decorate 159(g_tTexcdf4) DescriptorSet 0
+                              Decorate 156(g_tTex1df4a) DescriptorSet 0
                               Decorate 159(g_tTexcdf4) Binding 0
-                              Decorate 162(g_tTexcdi4) DescriptorSet 0
+                              Decorate 159(g_tTexcdf4) DescriptorSet 0
                               Decorate 162(g_tTexcdi4) Binding 0
-                              Decorate 165(g_tTexcdu4) DescriptorSet 0
+                              Decorate 162(g_tTexcdi4) DescriptorSet 0
                               Decorate 165(g_tTexcdu4) Binding 0
+                              Decorate 165(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
index ce799699..2f245162 100644
--- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
@@ -378,30 +378,30 @@ using depth_any
                               Name 113  "g_tTexcdf4"
                               Name 116  "g_tTexcdi4"
                               Name 119  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 38(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 38(g_tTex1di4) Binding 2
-                              Decorate 50(g_tTex1du4) DescriptorSet 0
+                              Decorate 38(g_tTex1di4) DescriptorSet 0
                               Decorate 50(g_tTex1du4) Binding 3
-                              Decorate 59(g_tTex2df4) DescriptorSet 0
+                              Decorate 50(g_tTex1du4) DescriptorSet 0
                               Decorate 59(g_tTex2df4) Binding 4
-                              Decorate 75(g_tTex2di4) DescriptorSet 0
+                              Decorate 59(g_tTex2df4) DescriptorSet 0
                               Decorate 75(g_tTex2di4) Binding 5
-                              Decorate 84(g_tTex2du4) DescriptorSet 0
+                              Decorate 75(g_tTex2di4) DescriptorSet 0
                               Decorate 84(g_tTex2du4) Binding 6
+                              Decorate 84(g_tTex2du4) DescriptorSet 0
                               Decorate 103(@entryPointOutput.Color) Location 0
                               Decorate 107(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 110(g_tTex1df4a) DescriptorSet 0
                               Decorate 110(g_tTex1df4a) Binding 1
-                              Decorate 113(g_tTexcdf4) DescriptorSet 0
+                              Decorate 110(g_tTex1df4a) DescriptorSet 0
                               Decorate 113(g_tTexcdf4) Binding 0
-                              Decorate 116(g_tTexcdi4) DescriptorSet 0
+                              Decorate 113(g_tTexcdf4) DescriptorSet 0
                               Decorate 116(g_tTexcdi4) Binding 0
-                              Decorate 119(g_tTexcdu4) DescriptorSet 0
+                              Decorate 116(g_tTexcdi4) DescriptorSet 0
                               Decorate 119(g_tTexcdu4) Binding 0
+                              Decorate 119(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
index 7f3af783..5057df6b 100644
--- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
@@ -399,30 +399,30 @@ using depth_any
                               Name 139  "@entryPointOutput.Color"
                               Name 143  "@entryPointOutput.Depth"
                               Name 146  "g_tTex1df4"
-                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 16(g_tTex1df4a) Binding 1
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4a) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 36(g_tTex1di4a) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 36(g_tTex1di4a) Binding 2
-                              Decorate 50(g_tTex1du4a) DescriptorSet 0
+                              Decorate 36(g_tTex1di4a) DescriptorSet 0
                               Decorate 50(g_tTex1du4a) Binding 3
-                              Decorate 61(g_tTex2df4a) DescriptorSet 0
+                              Decorate 50(g_tTex1du4a) DescriptorSet 0
                               Decorate 61(g_tTex2df4a) Binding 4
-                              Decorate 72(g_tTex2di4a) DescriptorSet 0
+                              Decorate 61(g_tTex2df4a) DescriptorSet 0
                               Decorate 72(g_tTex2di4a) Binding 5
-                              Decorate 83(g_tTex2du4a) DescriptorSet 0
+                              Decorate 72(g_tTex2di4a) DescriptorSet 0
                               Decorate 83(g_tTex2du4a) Binding 6
-                              Decorate 95(g_tTexcdf4a) DescriptorSet 0
+                              Decorate 83(g_tTex2du4a) DescriptorSet 0
                               Decorate 95(g_tTexcdf4a) Binding 7
-                              Decorate 105(g_tTexcdi4a) DescriptorSet 0
+                              Decorate 95(g_tTexcdf4a) DescriptorSet 0
                               Decorate 105(g_tTexcdi4a) Binding 8
-                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
+                              Decorate 105(g_tTexcdi4a) DescriptorSet 0
                               Decorate 115(g_tTexcdu4a) Binding 9
+                              Decorate 115(g_tTexcdu4a) DescriptorSet 0
                               Decorate 139(@entryPointOutput.Color) Location 0
                               Decorate 143(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 146(g_tTex1df4) DescriptorSet 0
                               Decorate 146(g_tTex1df4) Binding 0
+                              Decorate 146(g_tTex1df4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
index e1d449f5..7055dfae 100644
--- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
@@ -473,38 +473,38 @@ using depth_any
                               Name 167  "@entryPointOutput.Depth"
                               Name 170  "g_sSamp2d"
                               Name 171  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4) Binding 2
-                              Decorate 46(g_tTex1du4) DescriptorSet 0
+                              Decorate 33(g_tTex1di4) DescriptorSet 0
                               Decorate 46(g_tTex1du4) Binding 3
-                              Decorate 56(g_tTex2df4) DescriptorSet 0
+                              Decorate 46(g_tTex1du4) DescriptorSet 0
                               Decorate 56(g_tTex2df4) Binding 4
-                              Decorate 67(g_tTex2di4) DescriptorSet 0
+                              Decorate 56(g_tTex2df4) DescriptorSet 0
                               Decorate 67(g_tTex2di4) Binding 5
-                              Decorate 78(g_tTex2du4) DescriptorSet 0
+                              Decorate 67(g_tTex2di4) DescriptorSet 0
                               Decorate 78(g_tTex2du4) Binding 6
-                              Decorate 90(g_tTex3df4) DescriptorSet 0
+                              Decorate 78(g_tTex2du4) DescriptorSet 0
                               Decorate 90(g_tTex3df4) Binding 7
-                              Decorate 101(g_tTex3di4) DescriptorSet 0
+                              Decorate 90(g_tTex3df4) DescriptorSet 0
                               Decorate 101(g_tTex3di4) Binding 8
-                              Decorate 111(g_tTex3du4) DescriptorSet 0
+                              Decorate 101(g_tTex3di4) DescriptorSet 0
                               Decorate 111(g_tTex3du4) Binding 9
-                              Decorate 124(g_tTexcdf4) DescriptorSet 0
+                              Decorate 111(g_tTex3du4) DescriptorSet 0
                               Decorate 124(g_tTexcdf4) Binding 10
-                              Decorate 133(g_tTexcdi4) DescriptorSet 0
+                              Decorate 124(g_tTexcdf4) DescriptorSet 0
                               Decorate 133(g_tTexcdi4) Binding 11
-                              Decorate 142(g_tTexcdu4) DescriptorSet 0
+                              Decorate 133(g_tTexcdi4) DescriptorSet 0
                               Decorate 142(g_tTexcdu4) Binding 12
+                              Decorate 142(g_tTexcdu4) DescriptorSet 0
                               Decorate 163(@entryPointOutput.Color) Location 0
                               Decorate 167(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 170(g_sSamp2d) DescriptorSet 0
                               Decorate 170(g_sSamp2d) Binding 0
-                              Decorate 171(g_tTex1df4a) DescriptorSet 0
+                              Decorate 170(g_sSamp2d) DescriptorSet 0
                               Decorate 171(g_tTex1df4a) Binding 1
+                              Decorate 171(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
index bbb51f37..f5901331 100644
--- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
@@ -427,35 +427,35 @@ Shader version: 500
                               Name 149  "vsout"
                               Name 158  "@entryPointOutput.Pos"
                               Name 161  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 33(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 33(g_tTex1di4) Binding 2
-                              Decorate 46(g_tTex1du4) DescriptorSet 0
+                              Decorate 33(g_tTex1di4) DescriptorSet 0
                               Decorate 46(g_tTex1du4) Binding 3
-                              Decorate 56(g_tTex2df4) DescriptorSet 0
+                              Decorate 46(g_tTex1du4) DescriptorSet 0
                               Decorate 56(g_tTex2df4) Binding 4
-                              Decorate 67(g_tTex2di4) DescriptorSet 0
+                              Decorate 56(g_tTex2df4) DescriptorSet 0
                               Decorate 67(g_tTex2di4) Binding 5
-                              Decorate 78(g_tTex2du4) DescriptorSet 0
+                              Decorate 67(g_tTex2di4) DescriptorSet 0
                               Decorate 78(g_tTex2du4) Binding 6
-                              Decorate 90(g_tTex3df4) DescriptorSet 0
+                              Decorate 78(g_tTex2du4) DescriptorSet 0
                               Decorate 90(g_tTex3df4) Binding 7
-                              Decorate 101(g_tTex3di4) DescriptorSet 0
+                              Decorate 90(g_tTex3df4) DescriptorSet 0
                               Decorate 101(g_tTex3di4) Binding 8
-                              Decorate 111(g_tTex3du4) DescriptorSet 0
+                              Decorate 101(g_tTex3di4) DescriptorSet 0
                               Decorate 111(g_tTex3du4) Binding 9
-                              Decorate 124(g_tTexcdf4) DescriptorSet 0
+                              Decorate 111(g_tTex3du4) DescriptorSet 0
                               Decorate 124(g_tTexcdf4) Binding 10
-                              Decorate 133(g_tTexcdi4) DescriptorSet 0
+                              Decorate 124(g_tTexcdf4) DescriptorSet 0
                               Decorate 133(g_tTexcdi4) Binding 11
-                              Decorate 142(g_tTexcdu4) DescriptorSet 0
+                              Decorate 133(g_tTexcdi4) DescriptorSet 0
                               Decorate 142(g_tTexcdu4) Binding 12
+                              Decorate 142(g_tTexcdu4) DescriptorSet 0
                               Decorate 158(@entryPointOutput.Pos) BuiltIn Position
-                              Decorate 161(g_tTex1df4a) DescriptorSet 0
                               Decorate 161(g_tTex1df4a) Binding 1
+                              Decorate 161(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
index 1b06c579..e1ec0fae 100644
--- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
@@ -443,36 +443,36 @@ using depth_any
                               Name 155  "g_tTexcdf4"
                               Name 158  "g_tTexcdi4"
                               Name 161  "g_tTexcdu4"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 34(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 34(g_tTex1di4) Binding 2
-                              Decorate 47(g_tTex1du4) DescriptorSet 0
+                              Decorate 34(g_tTex1di4) DescriptorSet 0
                               Decorate 47(g_tTex1du4) Binding 3
-                              Decorate 57(g_tTex2df4) DescriptorSet 0
+                              Decorate 47(g_tTex1du4) DescriptorSet 0
                               Decorate 57(g_tTex2df4) Binding 4
-                              Decorate 71(g_tTex2di4) DescriptorSet 0
+                              Decorate 57(g_tTex2df4) DescriptorSet 0
                               Decorate 71(g_tTex2di4) Binding 5
-                              Decorate 83(g_tTex2du4) DescriptorSet 0
+                              Decorate 71(g_tTex2di4) DescriptorSet 0
                               Decorate 83(g_tTex2du4) Binding 6
-                              Decorate 97(g_tTex3df4) DescriptorSet 0
+                              Decorate 83(g_tTex2du4) DescriptorSet 0
                               Decorate 97(g_tTex3df4) Binding 7
-                              Decorate 110(g_tTex3di4) DescriptorSet 0
+                              Decorate 97(g_tTex3df4) DescriptorSet 0
                               Decorate 110(g_tTex3di4) Binding 8
-                              Decorate 121(g_tTex3du4) DescriptorSet 0
+                              Decorate 110(g_tTex3di4) DescriptorSet 0
                               Decorate 121(g_tTex3du4) Binding 9
+                              Decorate 121(g_tTex3du4) DescriptorSet 0
                               Decorate 145(@entryPointOutput.Color) Location 0
                               Decorate 149(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 152(g_tTex1df4a) DescriptorSet 0
                               Decorate 152(g_tTex1df4a) Binding 1
-                              Decorate 155(g_tTexcdf4) DescriptorSet 0
+                              Decorate 152(g_tTex1df4a) DescriptorSet 0
                               Decorate 155(g_tTexcdf4) Binding 0
-                              Decorate 158(g_tTexcdi4) DescriptorSet 0
+                              Decorate 155(g_tTexcdf4) DescriptorSet 0
                               Decorate 158(g_tTexcdi4) Binding 0
-                              Decorate 161(g_tTexcdu4) DescriptorSet 0
+                              Decorate 158(g_tTexcdi4) DescriptorSet 0
                               Decorate 161(g_tTexcdu4) Binding 0
+                              Decorate 161(g_tTexcdu4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
index e2560546..7c057dff 100644
--- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
@@ -332,24 +332,24 @@ using depth_any
                               Name 111  "@entryPointOutput.Color"
                               Name 115  "@entryPointOutput.Depth"
                               Name 118  "g_tTex1df4a"
-                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 16(g_tTex1df4) Binding 0
-                              Decorate 20(g_sSamp) DescriptorSet 0
+                              Decorate 16(g_tTex1df4) DescriptorSet 0
                               Decorate 20(g_sSamp) Binding 0
-                              Decorate 37(g_tTex1di4) DescriptorSet 0
+                              Decorate 20(g_sSamp) DescriptorSet 0
                               Decorate 37(g_tTex1di4) Binding 2
-                              Decorate 52(g_tTex1du4) DescriptorSet 0
+                              Decorate 37(g_tTex1di4) DescriptorSet 0
                               Decorate 52(g_tTex1du4) Binding 3
-                              Decorate 64(g_tTex2df4) DescriptorSet 0
+                              Decorate 52(g_tTex1du4) DescriptorSet 0
                               Decorate 64(g_tTex2df4) Binding 4
-                              Decorate 77(g_tTex2di4) DescriptorSet 0
+                              Decorate 64(g_tTex2df4) DescriptorSet 0
                               Decorate 77(g_tTex2di4) Binding 5
-                              Decorate 88(g_tTex2du4) DescriptorSet 0
+                              Decorate 77(g_tTex2di4) DescriptorSet 0
                               Decorate 88(g_tTex2du4) Binding 6
+                              Decorate 88(g_tTex2du4) DescriptorSet 0
                               Decorate 111(@entryPointOutput.Color) Location 0
                               Decorate 115(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 118(g_tTex1df4a) DescriptorSet 0
                               Decorate 118(g_tTex1df4a) Binding 1
+                              Decorate 118(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.snorm.uav.comp.out b/Test/baseResults/hlsl.snorm.uav.comp.out
index 40ab6cf1..de82aa4d 100644
--- a/Test/baseResults/hlsl.snorm.uav.comp.out
+++ b/Test/baseResults/hlsl.snorm.uav.comp.out
@@ -136,18 +136,18 @@ local_size = (16, 16, 1)
                               Name 47  "tid"
                               Name 49  "tid"
                               Name 51  "param"
-                              Decorate 19(ResultInS) DescriptorSet 0
                               Decorate 19(ResultInS) Binding 1
-                              MemberDecorate 25($Global) 0 Offset 0
+                              Decorate 19(ResultInS) DescriptorSet 0
                               Decorate 25($Global) Block
-                              Decorate 27 DescriptorSet 0
+                              MemberDecorate 25($Global) 0 Offset 0
                               Decorate 27 Binding 2
-                              Decorate 34(ResultOutS) DescriptorSet 0
+                              Decorate 27 DescriptorSet 0
                               Decorate 34(ResultOutS) Binding 1
-                              Decorate 39(ResultInU) DescriptorSet 0
+                              Decorate 34(ResultOutS) DescriptorSet 0
                               Decorate 39(ResultInU) Binding 0
-                              Decorate 43(ResultOutU) DescriptorSet 0
+                              Decorate 39(ResultInU) DescriptorSet 0
                               Decorate 43(ResultOutU) Binding 0
+                              Decorate 43(ResultOutU) DescriptorSet 0
                               Decorate 49(tid) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out b/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
index 2198affb..3524cf9f 100644
--- a/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
+++ b/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
@@ -116,10 +116,10 @@ local_size = (64, 1, 1)
                               Name 37  "dispatchThreadID"
                               Name 39  "param"
                               Decorate 27 ArrayStride 4
-                              MemberDecorate 28(buffer) 0 Offset 0
                               Decorate 28(buffer) BufferBlock
-                              Decorate 30(buffer) DescriptorSet 0
+                              MemberDecorate 28(buffer) 0 Offset 0
                               Decorate 30(buffer) Binding 0
+                              Decorate 30(buffer) DescriptorSet 0
                               Decorate 37(dispatchThreadID) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out
index 144bebc6..b656ae88 100644
--- a/Test/baseResults/hlsl.stringtoken.frag.out
+++ b/Test/baseResults/hlsl.stringtoken.frag.out
@@ -90,12 +90,12 @@ gl_FragCoord origin is upper left
                               MemberName 31($Global) 0  "TestUF"
                               Name 33  ""
                               Decorate 25(@entryPointOutput.Color) Location 0
-                              Decorate 30(TestTexture) DescriptorSet 0
                               Decorate 30(TestTexture) Binding 0
-                              MemberDecorate 31($Global) 0 Offset 0
+                              Decorate 30(TestTexture) DescriptorSet 0
                               Decorate 31($Global) Block
-                              Decorate 33 DescriptorSet 0
+                              MemberDecorate 31($Global) 0 Offset 0
                               Decorate 33 Binding 0
+                              Decorate 33 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out
index a36bba42..24671d46 100644
--- a/Test/baseResults/hlsl.struct.frag.out
+++ b/Test/baseResults/hlsl.struct.frag.out
@@ -279,8 +279,8 @@ Validation failed
                               Decorate 65(s.c) Location 3
                               Decorate 71(s.d) Centroid
                               Decorate 71(s.d) Location 4
-                              Decorate 76(s.ff1) Flat
                               Decorate 76(s.ff1) BuiltIn FrontFacing
+                              Decorate 76(s.ff1) Flat
                               Decorate 80(s.ff2) Flat
                               Decorate 80(s.ff2) Location 5
                               Decorate 84(s.ff3) Flat
@@ -291,12 +291,12 @@ Validation failed
                               MemberDecorate 98(myS) 1 Offset 4
                               MemberDecorate 98(myS) 2 Offset 16
                               MemberDecorate 98(myS) 3 Offset 32
+                              Decorate 99($Global) Block
                               MemberDecorate 99($Global) 0 Offset 0
                               MemberDecorate 99($Global) 1 Offset 1620
                               MemberDecorate 99($Global) 2 Offset 1636
-                              Decorate 99($Global) Block
-                              Decorate 101 DescriptorSet 0
                               Decorate 101 Binding 0
+                              Decorate 101 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.structIoFourWay.frag.out b/Test/baseResults/hlsl.structIoFourWay.frag.out
index 3faff5bd..1143a942 100644
--- a/Test/baseResults/hlsl.structIoFourWay.frag.out
+++ b/Test/baseResults/hlsl.structIoFourWay.frag.out
@@ -217,14 +217,14 @@ using depth_greater
                               MemberDecorate 58(T) 1 Offset 72
                               MemberDecorate 58(T) 2 Offset 76
                               MemberDecorate 58(T) 3 Offset 80
-                              MemberDecorate 59($Global) 0 Offset 0
                               Decorate 59($Global) Block
-                              Decorate 61 DescriptorSet 0
+                              MemberDecorate 59($Global) 0 Offset 0
                               Decorate 61 Binding 0
-                              MemberDecorate 62(buff) 0 Offset 96
+                              Decorate 61 DescriptorSet 0
                               Decorate 62(buff) Block
-                              Decorate 64 DescriptorSet 0
+                              MemberDecorate 62(buff) 0 Offset 96
                               Decorate 64 Binding 0
+                              Decorate 64 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out
index 4896dca5..e5c01fcc 100644
--- a/Test/baseResults/hlsl.structarray.flatten.frag.out
+++ b/Test/baseResults/hlsl.structarray.flatten.frag.out
@@ -198,51 +198,51 @@ Validation failed
                               Name 77  "g_texdata_array2[2].samp"
                               Name 78  "g_texdata_array2[2].tex"
                               Name 79  "g_texdata_array2[2].nonopaque_thing"
-                              Decorate 18(g_texdata.tex) DescriptorSet 0
                               Decorate 18(g_texdata.tex) Binding 1
-                              Decorate 22(g_texdata.samp) DescriptorSet 0
+                              Decorate 18(g_texdata.tex) DescriptorSet 0
                               Decorate 22(g_texdata.samp) Binding 0
-                              Decorate 28(g_texdata_array[1].tex) DescriptorSet 0
+                              Decorate 22(g_texdata.samp) DescriptorSet 0
                               Decorate 28(g_texdata_array[1].tex) Binding 3
-                              Decorate 30(g_texdata_array[1].samp) DescriptorSet 0
+                              Decorate 28(g_texdata_array[1].tex) DescriptorSet 0
                               Decorate 30(g_texdata_array[1].samp) Binding 2
-                              Decorate 40(g_texdata_array2[1].tex) DescriptorSet 0
+                              Decorate 30(g_texdata_array[1].samp) DescriptorSet 0
                               Decorate 40(g_texdata_array2[1].tex) Binding 5
-                              Decorate 45(g_texdata_array2[1].samp) DescriptorSet 0
+                              Decorate 40(g_texdata_array2[1].tex) DescriptorSet 0
                               Decorate 45(g_texdata_array2[1].samp) Binding 4
+                              Decorate 45(g_texdata_array2[1].samp) DescriptorSet 0
                               Decorate 59(ps_output.color) Location 0
-                              Decorate 62(g_samp) DescriptorSet 0
                               Decorate 62(g_samp) Binding 0
-                              Decorate 63(g_tex) DescriptorSet 0
+                              Decorate 62(g_samp) DescriptorSet 0
                               Decorate 63(g_tex) Binding 0
+                              Decorate 63(g_tex) DescriptorSet 0
                               Decorate 65(g_texdata.nonopaque_thing) Location 0
                               Decorate 65(g_texdata.nonopaque_thing) DescriptorSet 0
-                              Decorate 66(g_texdata_array[0].samp) DescriptorSet 0
                               Decorate 66(g_texdata_array[0].samp) Binding 0
-                              Decorate 67(g_texdata_array[0].tex) DescriptorSet 0
+                              Decorate 66(g_texdata_array[0].samp) DescriptorSet 0
                               Decorate 67(g_texdata_array[0].tex) Binding 0
+                              Decorate 67(g_texdata_array[0].tex) DescriptorSet 0
                               Decorate 68(g_texdata_array[0].nonopaque_thing) Location 1
                               Decorate 68(g_texdata_array[0].nonopaque_thing) DescriptorSet 0
                               Decorate 69(g_texdata_array[1].nonopaque_thing) Location 2
                               Decorate 69(g_texdata_array[1].nonopaque_thing) DescriptorSet 0
-                              Decorate 70(g_texdata_array[2].samp) DescriptorSet 0
                               Decorate 70(g_texdata_array[2].samp) Binding 0
-                              Decorate 71(g_texdata_array[2].tex) DescriptorSet 0
+                              Decorate 70(g_texdata_array[2].samp) DescriptorSet 0
                               Decorate 71(g_texdata_array[2].tex) Binding 0
+                              Decorate 71(g_texdata_array[2].tex) DescriptorSet 0
                               Decorate 72(g_texdata_array[2].nonopaque_thing) Location 3
                               Decorate 72(g_texdata_array[2].nonopaque_thing) DescriptorSet 0
-                              Decorate 73(g_texdata_array2[0].samp) DescriptorSet 0
                               Decorate 73(g_texdata_array2[0].samp) Binding 0
-                              Decorate 74(g_texdata_array2[0].tex) DescriptorSet 0
+                              Decorate 73(g_texdata_array2[0].samp) DescriptorSet 0
                               Decorate 74(g_texdata_array2[0].tex) Binding 0
+                              Decorate 74(g_texdata_array2[0].tex) DescriptorSet 0
                               Decorate 75(g_texdata_array2[0].nonopaque_thing) Location 4
                               Decorate 75(g_texdata_array2[0].nonopaque_thing) DescriptorSet 0
                               Decorate 76(g_texdata_array2[1].nonopaque_thing) Location 5
                               Decorate 76(g_texdata_array2[1].nonopaque_thing) DescriptorSet 0
-                              Decorate 77(g_texdata_array2[2].samp) DescriptorSet 0
                               Decorate 77(g_texdata_array2[2].samp) Binding 0
-                              Decorate 78(g_texdata_array2[2].tex) DescriptorSet 0
+                              Decorate 77(g_texdata_array2[2].samp) DescriptorSet 0
                               Decorate 78(g_texdata_array2[2].tex) Binding 0
+                              Decorate 78(g_texdata_array2[2].tex) DescriptorSet 0
                               Decorate 79(g_texdata_array2[2].nonopaque_thing) Location 6
                               Decorate 79(g_texdata_array2[2].nonopaque_thing) DescriptorSet 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.structbuffer.append.fn.frag.out b/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
index acfbf5d9..aa3fa98c 100644
--- a/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
@@ -186,28 +186,28 @@ Validation failed
                               Name 68  "sbuf_c@count"
                               Name 69  "sbuf_unused"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9 0 Offset 0
                               Decorate 9 BufferBlock
+                              MemberDecorate 9 0 Offset 0
                               Decorate 12 BufferBlock
-                              Decorate 49(sbuf_a) DescriptorSet 0
                               Decorate 49(sbuf_a) Binding 0
-                              Decorate 50(sbuf_a@count) DescriptorSet 0
+                              Decorate 49(sbuf_a) DescriptorSet 0
                               Decorate 50(sbuf_a@count) Binding 0
-                              Decorate 51(sbuf_c) DescriptorSet 0
+                              Decorate 50(sbuf_a@count) DescriptorSet 0
                               Decorate 51(sbuf_c) Binding 1
-                              Decorate 52(sbuf_c@count) DescriptorSet 0
+                              Decorate 51(sbuf_c) DescriptorSet 0
                               Decorate 52(sbuf_c@count) Binding 0
+                              Decorate 52(sbuf_c@count) DescriptorSet 0
                               Decorate 58(pos) Flat
                               Decorate 58(pos) Location 0
                               Decorate 61(@entryPointOutput) Location 0
-                              MemberDecorate 65(sbuf_a@count) 0 Offset 0
                               Decorate 65(sbuf_a@count) BufferBlock
-                              Decorate 67(sbuf_a@count) DescriptorSet 0
+                              MemberDecorate 65(sbuf_a@count) 0 Offset 0
                               Decorate 67(sbuf_a@count) Binding 0
-                              Decorate 68(sbuf_c@count) DescriptorSet 0
+                              Decorate 67(sbuf_a@count) DescriptorSet 0
                               Decorate 68(sbuf_c@count) Binding 0
-                              Decorate 69(sbuf_unused) DescriptorSet 0
+                              Decorate 68(sbuf_c@count) DescriptorSet 0
                               Decorate 69(sbuf_unused) Binding 0
+                              Decorate 69(sbuf_unused) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/hlsl.structbuffer.append.frag.out b/Test/baseResults/hlsl.structbuffer.append.frag.out
index 4c57e0bc..48dfe6a5 100644
--- a/Test/baseResults/hlsl.structbuffer.append.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.append.frag.out
@@ -150,23 +150,23 @@ gl_FragCoord origin is upper left
                               Name 52  "param"
                               Name 55  "sbuf_unused"
                               Decorate 14 ArrayStride 16
-                              MemberDecorate 15(sbuf_a) 0 Offset 0
                               Decorate 15(sbuf_a) BufferBlock
-                              Decorate 17(sbuf_a) DescriptorSet 0
+                              MemberDecorate 15(sbuf_a) 0 Offset 0
                               Decorate 17(sbuf_a) Binding 0
-                              MemberDecorate 20(sbuf_a@count) 0 Offset 0
+                              Decorate 17(sbuf_a) DescriptorSet 0
                               Decorate 20(sbuf_a@count) BufferBlock
-                              Decorate 22(sbuf_a@count) DescriptorSet 0
+                              MemberDecorate 20(sbuf_a@count) 0 Offset 0
                               Decorate 22(sbuf_a@count) Binding 1
-                              Decorate 35(sbuf_c) DescriptorSet 0
+                              Decorate 22(sbuf_a@count) DescriptorSet 0
                               Decorate 35(sbuf_c) Binding 2
-                              Decorate 36(sbuf_c@count) DescriptorSet 0
+                              Decorate 35(sbuf_c) DescriptorSet 0
                               Decorate 36(sbuf_c@count) Binding 3
+                              Decorate 36(sbuf_c@count) DescriptorSet 0
                               Decorate 48(pos) Flat
                               Decorate 48(pos) Location 0
                               Decorate 51(@entryPointOutput) Location 0
-                              Decorate 55(sbuf_unused) DescriptorSet 0
                               Decorate 55(sbuf_unused) Binding 0
+                              Decorate 55(sbuf_unused) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/hlsl.structbuffer.atomics.frag.out b/Test/baseResults/hlsl.structbuffer.atomics.frag.out
index 3f26652d..712d974c 100644
--- a/Test/baseResults/hlsl.structbuffer.atomics.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.atomics.frag.out
@@ -496,10 +496,10 @@ Validation failed
                               Name 83  "@entryPointOutput"
                               Name 84  "param"
                               Decorate 14 ArrayStride 4
-                              MemberDecorate 15(sbuf) 0 Offset 0
                               Decorate 15(sbuf) BufferBlock
-                              Decorate 17(sbuf) DescriptorSet 0
+                              MemberDecorate 15(sbuf) 0 Offset 0
                               Decorate 17(sbuf) Binding 0
+                              Decorate 17(sbuf) DescriptorSet 0
                               Decorate 80(pos) Flat
                               Decorate 80(pos) Location 0
                               Decorate 83(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.byte.frag.out b/Test/baseResults/hlsl.structbuffer.byte.frag.out
index f3e92cea..389cd9c1 100644
--- a/Test/baseResults/hlsl.structbuffer.byte.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.byte.frag.out
@@ -348,11 +348,11 @@ gl_FragCoord origin is upper left
                               Name 110  "@entryPointOutput"
                               Name 111  "param"
                               Decorate 15 ArrayStride 4
+                              Decorate 16(sbuf) BufferBlock
                               MemberDecorate 16(sbuf) 0 NonWritable
                               MemberDecorate 16(sbuf) 0 Offset 0
-                              Decorate 16(sbuf) BufferBlock
-                              Decorate 18(sbuf) DescriptorSet 0
                               Decorate 18(sbuf) Binding 0
+                              Decorate 18(sbuf) DescriptorSet 0
                               Decorate 107(pos) Flat
                               Decorate 107(pos) Location 0
                               Decorate 110(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.coherent.frag.out b/Test/baseResults/hlsl.structbuffer.coherent.frag.out
index 65e4a146..6647df1a 100644
--- a/Test/baseResults/hlsl.structbuffer.coherent.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.coherent.frag.out
@@ -204,19 +204,19 @@ gl_FragCoord origin is upper left
                               Name 74  "@entryPointOutput"
                               Name 75  "param"
                               Decorate 14 ArrayStride 4
+                              Decorate 15(sbuf2) BufferBlock
                               MemberDecorate 15(sbuf2) 0 Coherent
                               MemberDecorate 15(sbuf2) 0 Offset 0
-                              Decorate 15(sbuf2) BufferBlock
-                              Decorate 17(sbuf2) DescriptorSet 0
                               Decorate 17(sbuf2) Binding 1
+                              Decorate 17(sbuf2) DescriptorSet 0
                               MemberDecorate 28(sb_t) 0 Offset 0
                               MemberDecorate 28(sb_t) 1 Offset 12
                               Decorate 29 ArrayStride 16
+                              Decorate 30(sbuf) BufferBlock
                               MemberDecorate 30(sbuf) 0 Coherent
                               MemberDecorate 30(sbuf) 0 Offset 0
-                              Decorate 30(sbuf) BufferBlock
-                              Decorate 32(sbuf) DescriptorSet 0
                               Decorate 32(sbuf) Binding 0
+                              Decorate 32(sbuf) DescriptorSet 0
                               Decorate 71(pos) Flat
                               Decorate 71(pos) Location 0
                               Decorate 74(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.floatidx.comp.out b/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
index 6a86e481..cea0ef7a 100644
--- a/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
+++ b/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
@@ -217,21 +217,21 @@ local_size = (1, 1, 1)
                               MemberDecorate 19(sb_t) 0 Offset 0
                               MemberDecorate 19(sb_t) 1 Offset 16
                               Decorate 20 ArrayStride 32
-                              MemberDecorate 21(csb) 0 Offset 0
                               Decorate 21(csb) BufferBlock
-                              Decorate 23(csb) DescriptorSet 0
+                              MemberDecorate 21(csb) 0 Offset 0
                               Decorate 23(csb) Binding 1
-                              MemberDecorate 26(csb@count) 0 Offset 0
+                              Decorate 23(csb) DescriptorSet 0
                               Decorate 26(csb@count) BufferBlock
-                              Decorate 28(csb@count) DescriptorSet 0
+                              MemberDecorate 26(csb@count) 0 Offset 0
                               Decorate 28(csb@count) Binding 2
-                              Decorate 58(outtx) DescriptorSet 0
+                              Decorate 28(csb@count) DescriptorSet 0
                               Decorate 58(outtx) Binding 0
+                              Decorate 58(outtx) DescriptorSet 0
                               Decorate 63 ArrayStride 16
-                              MemberDecorate 64(rwsb) 0 Offset 0
                               Decorate 64(rwsb) BufferBlock
-                              Decorate 66(rwsb) DescriptorSet 0
+                              MemberDecorate 64(rwsb) 0 Offset 0
                               Decorate 66(rwsb) Binding 3
+                              Decorate 66(rwsb) DescriptorSet 0
                               Decorate 80(nThreadId) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.structbuffer.fn.frag.out b/Test/baseResults/hlsl.structbuffer.fn.frag.out
index 2086d59f..846bcab5 100644
--- a/Test/baseResults/hlsl.structbuffer.fn.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.fn.frag.out
@@ -182,33 +182,33 @@ Validation failed
                               MemberName 75(sbuf3) 0  "@data"
                               Name 77  "sbuf3"
                               Decorate 8 ArrayStride 16
+                              Decorate 9 BufferBlock
                               MemberDecorate 9 0 NonWritable
                               MemberDecorate 9 0 Offset 0
-                              Decorate 9 BufferBlock
                               Decorate 13(sb) NonWritable
                               Decorate 17 ArrayStride 16
-                              MemberDecorate 18 0 Offset 0
                               Decorate 18 BufferBlock
+                              MemberDecorate 18 0 Offset 0
                               Decorate 20 BufferBlock
-                              Decorate 47(sbuf2) DescriptorSet 0
                               Decorate 47(sbuf2) Binding 0
-                              Decorate 48(sbuf2@count) DescriptorSet 0
+                              Decorate 47(sbuf2) DescriptorSet 0
                               Decorate 48(sbuf2@count) Binding 0
-                              Decorate 50(sbuf) DescriptorSet 0
+                              Decorate 48(sbuf2@count) DescriptorSet 0
                               Decorate 50(sbuf) Binding 10
+                              Decorate 50(sbuf) DescriptorSet 0
                               Decorate 63(pos) Flat
                               Decorate 63(pos) Location 0
                               Decorate 66(@entryPointOutput) Location 0
-                              MemberDecorate 70(sbuf2@count) 0 Offset 0
                               Decorate 70(sbuf2@count) BufferBlock
-                              Decorate 72(sbuf2@count) DescriptorSet 0
+                              MemberDecorate 70(sbuf2@count) 0 Offset 0
                               Decorate 72(sbuf2@count) Binding 0
+                              Decorate 72(sbuf2@count) DescriptorSet 0
                               Decorate 74 ArrayStride 16
+                              Decorate 75(sbuf3) BufferBlock
                               MemberDecorate 75(sbuf3) 0 NonWritable
                               MemberDecorate 75(sbuf3) 0 Offset 0
-                              Decorate 75(sbuf3) BufferBlock
-                              Decorate 77(sbuf3) DescriptorSet 0
                               Decorate 77(sbuf3) Binding 12
+                              Decorate 77(sbuf3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/hlsl.structbuffer.fn2.comp.out b/Test/baseResults/hlsl.structbuffer.fn2.comp.out
index 1953d467..20159a59 100644
--- a/Test/baseResults/hlsl.structbuffer.fn2.comp.out
+++ b/Test/baseResults/hlsl.structbuffer.fn2.comp.out
@@ -165,14 +165,14 @@ local_size = (256, 1, 1)
                               Name 57  "dispatchId"
                               Name 60  "param"
                               Decorate 8 ArrayStride 4
+                              Decorate 9 BufferBlock
                               MemberDecorate 9 0 NonWritable
                               MemberDecorate 9 0 Offset 0
-                              Decorate 9 BufferBlock
                               Decorate 14(buffer) NonWritable
-                              Decorate 44(g_input) DescriptorSet 0
                               Decorate 44(g_input) Binding 0
-                              Decorate 50(g_output) DescriptorSet 0
+                              Decorate 44(g_input) DescriptorSet 0
                               Decorate 50(g_output) Binding 1
+                              Decorate 50(g_output) DescriptorSet 0
                               Decorate 57(dispatchId) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.structbuffer.frag.out b/Test/baseResults/hlsl.structbuffer.frag.out
index 0e16ef16..abcfa485 100644
--- a/Test/baseResults/hlsl.structbuffer.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.frag.out
@@ -225,17 +225,17 @@ gl_FragCoord origin is upper left
                               MemberDecorate 19(sb_t) 1 Offset 12
                               MemberDecorate 19(sb_t) 2 Offset 16
                               Decorate 20 ArrayStride 32
+                              Decorate 21(sbuf) BufferBlock
                               MemberDecorate 21(sbuf) 0 NonWritable
                               MemberDecorate 21(sbuf) 0 Offset 0
-                              Decorate 21(sbuf) BufferBlock
-                              Decorate 23(sbuf) DescriptorSet 0
                               Decorate 23(sbuf) Binding 10
+                              Decorate 23(sbuf) DescriptorSet 0
                               Decorate 58 ArrayStride 4
+                              Decorate 59(sbuf2) BufferBlock
                               MemberDecorate 59(sbuf2) 0 NonWritable
                               MemberDecorate 59(sbuf2) 0 Offset 0
-                              Decorate 59(sbuf2) BufferBlock
-                              Decorate 61(sbuf2) DescriptorSet 0
                               Decorate 61(sbuf2) Binding 0
+                              Decorate 61(sbuf2) DescriptorSet 0
                               Decorate 89(pos) Flat
                               Decorate 89(pos) Location 0
                               Decorate 92(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out b/Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out
index 95b13a8f..be5f1cb6 100644
--- a/Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out
+++ b/Test/baseResults/hlsl.structbuffer.incdec.frag.hlslfun1.out
@@ -30,27 +30,27 @@ hlsl.structbuffer.incdec.frag
                               Name 66  "@entryPointOutput"
                               Name 67  "param"
                               Decorate 19 ArrayStride 16
-                              MemberDecorate 20(sbuf_rw_i) 0 Offset 0
                               Decorate 20(sbuf_rw_i) BufferBlock
-                              Decorate 22(sbuf_rw_i) DescriptorSet 0
+                              MemberDecorate 20(sbuf_rw_i) 0 Offset 0
                               Decorate 22(sbuf_rw_i) Binding 0
-                              Decorate 26(sbuf_rw_d) DescriptorSet 0
+                              Decorate 22(sbuf_rw_i) DescriptorSet 0
+                              DecorateId 22(sbuf_rw_i) DecorationHlslCounterBufferGOOGLE 36(sbuf_rw_i@count)
                               Decorate 26(sbuf_rw_d) Binding 0
-                              Decorate 27(sbuf_rw_nocounter) DescriptorSet 0
+                              Decorate 26(sbuf_rw_d) DescriptorSet 0
+                              DecorateId 26(sbuf_rw_d) DecorationHlslCounterBufferGOOGLE 42(sbuf_rw_d@count)
                               Decorate 27(sbuf_rw_nocounter) Binding 0
-                              MemberDecorate 34(sbuf_rw_i@count) 0 Offset 0
+                              Decorate 27(sbuf_rw_nocounter) DescriptorSet 0
                               Decorate 34(sbuf_rw_i@count) BufferBlock
-                              Decorate 36(sbuf_rw_i@count) DescriptorSet 0
+                              MemberDecorate 34(sbuf_rw_i@count) 0 Offset 0
                               Decorate 36(sbuf_rw_i@count) Binding 0
-                              Decorate 42(sbuf_rw_d@count) DescriptorSet 0
+                              Decorate 36(sbuf_rw_i@count) DescriptorSet 0
                               Decorate 42(sbuf_rw_d@count) Binding 0
+                              Decorate 42(sbuf_rw_d@count) DescriptorSet 0
                               Decorate 63(pos) Flat
                               Decorate 63(pos) Location 0
                               DecorateStringGOOGLE 63(pos) DecorationHlslSemanticGOOGLE  "FOO"
                               Decorate 66(@entryPointOutput) Location 0
                               DecorateStringGOOGLE 66(@entryPointOutput) DecorationHlslSemanticGOOGLE  "SV_TARGET0"
-                              DecorateId 22(sbuf_rw_i) DecorationHlslCounterBufferGOOGLE 36(sbuf_rw_i@count)
-                              DecorateId 26(sbuf_rw_d) DecorationHlslCounterBufferGOOGLE 42(sbuf_rw_d@count)
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/hlsl.structbuffer.incdec.frag.out b/Test/baseResults/hlsl.structbuffer.incdec.frag.out
index 72efcc0e..3f12758c 100644
--- a/Test/baseResults/hlsl.structbuffer.incdec.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.incdec.frag.out
@@ -233,20 +233,20 @@ gl_FragCoord origin is upper left
                               Name 66  "@entryPointOutput"
                               Name 67  "param"
                               Decorate 19 ArrayStride 16
-                              MemberDecorate 20(sbuf_rw_i) 0 Offset 0
                               Decorate 20(sbuf_rw_i) BufferBlock
-                              Decorate 22(sbuf_rw_i) DescriptorSet 0
+                              MemberDecorate 20(sbuf_rw_i) 0 Offset 0
                               Decorate 22(sbuf_rw_i) Binding 0
-                              Decorate 26(sbuf_rw_d) DescriptorSet 0
+                              Decorate 22(sbuf_rw_i) DescriptorSet 0
                               Decorate 26(sbuf_rw_d) Binding 2
-                              Decorate 27(sbuf_rw_nocounter) DescriptorSet 0
+                              Decorate 26(sbuf_rw_d) DescriptorSet 0
                               Decorate 27(sbuf_rw_nocounter) Binding 4
-                              MemberDecorate 34(sbuf_rw_i@count) 0 Offset 0
+                              Decorate 27(sbuf_rw_nocounter) DescriptorSet 0
                               Decorate 34(sbuf_rw_i@count) BufferBlock
-                              Decorate 36(sbuf_rw_i@count) DescriptorSet 0
+                              MemberDecorate 34(sbuf_rw_i@count) 0 Offset 0
                               Decorate 36(sbuf_rw_i@count) Binding 1
-                              Decorate 42(sbuf_rw_d@count) DescriptorSet 0
+                              Decorate 36(sbuf_rw_i@count) DescriptorSet 0
                               Decorate 42(sbuf_rw_d@count) Binding 3
+                              Decorate 42(sbuf_rw_d@count) DescriptorSet 0
                               Decorate 63(pos) Flat
                               Decorate 63(pos) Location 0
                               Decorate 66(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.rw.frag.out b/Test/baseResults/hlsl.structbuffer.rw.frag.out
index 9dfdaf04..4fcc6896 100644
--- a/Test/baseResults/hlsl.structbuffer.rw.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.rw.frag.out
@@ -204,17 +204,17 @@ gl_FragCoord origin is upper left
                               Name 74  "@entryPointOutput"
                               Name 75  "param"
                               Decorate 14 ArrayStride 4
-                              MemberDecorate 15(sbuf2) 0 Offset 0
                               Decorate 15(sbuf2) BufferBlock
-                              Decorate 17(sbuf2) DescriptorSet 0
+                              MemberDecorate 15(sbuf2) 0 Offset 0
                               Decorate 17(sbuf2) Binding 1
+                              Decorate 17(sbuf2) DescriptorSet 0
                               MemberDecorate 28(sb_t) 0 Offset 0
                               MemberDecorate 28(sb_t) 1 Offset 12
                               Decorate 29 ArrayStride 16
-                              MemberDecorate 30(sbuf) 0 Offset 0
                               Decorate 30(sbuf) BufferBlock
-                              Decorate 32(sbuf) DescriptorSet 0
+                              MemberDecorate 30(sbuf) 0 Offset 0
                               Decorate 32(sbuf) Binding 0
+                              Decorate 32(sbuf) DescriptorSet 0
                               Decorate 71(pos) Flat
                               Decorate 71(pos) Location 0
                               Decorate 74(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
index 5fdbd1d1..d8ba034e 100644
--- a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
@@ -1032,10 +1032,10 @@ gl_FragCoord origin is upper left
                               Name 235  "@entryPointOutput"
                               Name 236  "param"
                               Decorate 15 ArrayStride 4
-                              MemberDecorate 16(sbuf) 0 Offset 0
                               Decorate 16(sbuf) BufferBlock
-                              Decorate 18(sbuf) DescriptorSet 0
+                              MemberDecorate 16(sbuf) 0 Offset 0
                               Decorate 18(sbuf) Binding 0
+                              Decorate 18(sbuf) DescriptorSet 0
                               Decorate 232(pos) Flat
                               Decorate 232(pos) Location 0
                               Decorate 235(@entryPointOutput) Location 0
diff --git a/Test/baseResults/hlsl.structbuffer.rwbyte2.comp.out b/Test/baseResults/hlsl.structbuffer.rwbyte2.comp.out
index b024bd42..fa058b61 100644
--- a/Test/baseResults/hlsl.structbuffer.rwbyte2.comp.out
+++ b/Test/baseResults/hlsl.structbuffer.rwbyte2.comp.out
@@ -95,15 +95,15 @@ local_size = (1, 1, 1)
                               MemberName 24(g_sbuf) 0  "@data"
                               Name 26  "g_sbuf"
                               Decorate 11 ArrayStride 4
-                              MemberDecorate 12(g_bbuf) 0 Offset 0
                               Decorate 12(g_bbuf) BufferBlock
-                              Decorate 14(g_bbuf) DescriptorSet 0
+                              MemberDecorate 12(g_bbuf) 0 Offset 0
                               Decorate 14(g_bbuf) Binding 1
+                              Decorate 14(g_bbuf) DescriptorSet 0
                               Decorate 23 ArrayStride 4
-                              MemberDecorate 24(g_sbuf) 0 Offset 0
                               Decorate 24(g_sbuf) BufferBlock
-                              Decorate 26(g_sbuf) DescriptorSet 0
+                              MemberDecorate 24(g_sbuf) 0 Offset 0
                               Decorate 26(g_sbuf) Binding 0
+                              Decorate 26(g_sbuf) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeInt 32 0
diff --git a/Test/baseResults/hlsl.structcopy.comp.out b/Test/baseResults/hlsl.structcopy.comp.out
index afc03e09..43e513d2 100644
--- a/Test/baseResults/hlsl.structcopy.comp.out
+++ b/Test/baseResults/hlsl.structcopy.comp.out
@@ -281,21 +281,21 @@ local_size = (128, 1, 1)
                               MemberDecorate 26(MyStruct) 1 Offset 4
                               MemberDecorate 26(MyStruct) 2 Offset 8
                               Decorate 27 ArrayStride 12
+                              Decorate 28(MyStructs) BufferBlock
                               MemberDecorate 28(MyStructs) 0 Offset 0
                               MemberDecorate 28(MyStructs) 1 Offset 4
-                              Decorate 28(MyStructs) BufferBlock
                               Decorate 29 ArrayStride 16
+                              Decorate 30(sb) BufferBlock
                               MemberDecorate 30(sb) 0 NonWritable
                               MemberDecorate 30(sb) 0 Offset 0
-                              Decorate 30(sb) BufferBlock
-                              Decorate 32(sb) DescriptorSet 0
                               Decorate 32(sb) Binding 0
+                              Decorate 32(sb) DescriptorSet 0
                               Decorate 64 ArrayStride 12
+                              Decorate 65(o) BufferBlock
                               MemberDecorate 65(o) 0 NonWritable
                               MemberDecorate 65(o) 0 Offset 0
-                              Decorate 65(o) BufferBlock
-                              Decorate 67(o) DescriptorSet 0
                               Decorate 67(o) Binding 1
+                              Decorate 67(o) DescriptorSet 0
                               Decorate 83(id) BuiltIn LocalInvocationIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.structcopylogical.comp.out b/Test/baseResults/hlsl.structcopylogical.comp.out
index a9b849be..700d415a 100644
--- a/Test/baseResults/hlsl.structcopylogical.comp.out
+++ b/Test/baseResults/hlsl.structcopylogical.comp.out
@@ -281,21 +281,21 @@ local_size = (128, 1, 1)
                               MemberDecorate 26(MyStruct) 1 Offset 4
                               MemberDecorate 26(MyStruct) 2 Offset 8
                               Decorate 27 ArrayStride 12
+                              Decorate 28(MyStructs) Block
                               MemberDecorate 28(MyStructs) 0 Offset 0
                               MemberDecorate 28(MyStructs) 1 Offset 4
-                              Decorate 28(MyStructs) Block
                               Decorate 29 ArrayStride 16
+                              Decorate 30(sb) Block
                               MemberDecorate 30(sb) 0 NonWritable
                               MemberDecorate 30(sb) 0 Offset 0
-                              Decorate 30(sb) Block
-                              Decorate 32(sb) DescriptorSet 0
                               Decorate 32(sb) Binding 0
+                              Decorate 32(sb) DescriptorSet 0
                               Decorate 54 ArrayStride 12
+                              Decorate 55(o) Block
                               MemberDecorate 55(o) 0 NonWritable
                               MemberDecorate 55(o) 0 Offset 0
-                              Decorate 55(o) Block
-                              Decorate 57(o) DescriptorSet 0
                               Decorate 57(o) Binding 1
+                              Decorate 57(o) DescriptorSet 0
                               Decorate 74(id) BuiltIn LocalInvocationIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.subpass.frag.out b/Test/baseResults/hlsl.subpass.frag.out
index 942ef5ee..4841862e 100644
--- a/Test/baseResults/hlsl.subpass.frag.out
+++ b/Test/baseResults/hlsl.subpass.frag.out
@@ -493,80 +493,80 @@ gl_FragCoord origin is upper left
                               Name 193  "result73"
                               Name 194  "subpass_2"
                               Name 202  "@entryPointOutput"
-                              Decorate 15(subpass_f4) DescriptorSet 0
                               Decorate 15(subpass_f4) Binding 1
+                              Decorate 15(subpass_f4) DescriptorSet 0
                               Decorate 15(subpass_f4) InputAttachmentIndex 1
-                              Decorate 27(subpass_i4) DescriptorSet 0
                               Decorate 27(subpass_i4) Binding 0
+                              Decorate 27(subpass_i4) DescriptorSet 0
                               Decorate 27(subpass_i4) InputAttachmentIndex 2
-                              Decorate 36(subpass_u4) DescriptorSet 0
                               Decorate 36(subpass_u4) Binding 2
+                              Decorate 36(subpass_u4) DescriptorSet 0
                               Decorate 36(subpass_u4) InputAttachmentIndex 3
-                              Decorate 42(subpass_ms_f4) DescriptorSet 0
                               Decorate 42(subpass_ms_f4) Binding 3
+                              Decorate 42(subpass_ms_f4) DescriptorSet 0
                               Decorate 42(subpass_ms_f4) InputAttachmentIndex 4
-                              Decorate 49(subpass_ms_i4) DescriptorSet 0
                               Decorate 49(subpass_ms_i4) Binding 4
+                              Decorate 49(subpass_ms_i4) DescriptorSet 0
                               Decorate 49(subpass_ms_i4) InputAttachmentIndex 5
-                              Decorate 55(subpass_ms_u4) DescriptorSet 0
                               Decorate 55(subpass_ms_u4) Binding 5
+                              Decorate 55(subpass_ms_u4) DescriptorSet 0
                               Decorate 55(subpass_ms_u4) InputAttachmentIndex 6
-                              Decorate 61(subpass_f3) DescriptorSet 0
                               Decorate 61(subpass_f3) Binding 6
+                              Decorate 61(subpass_f3) DescriptorSet 0
                               Decorate 61(subpass_f3) InputAttachmentIndex 1
-                              Decorate 71(subpass_i3) DescriptorSet 0
                               Decorate 71(subpass_i3) Binding 7
+                              Decorate 71(subpass_i3) DescriptorSet 0
                               Decorate 71(subpass_i3) InputAttachmentIndex 2
-                              Decorate 81(subpass_u3) DescriptorSet 0
                               Decorate 81(subpass_u3) Binding 8
+                              Decorate 81(subpass_u3) DescriptorSet 0
                               Decorate 81(subpass_u3) InputAttachmentIndex 3
-                              Decorate 89(subpass_ms_f3) DescriptorSet 0
                               Decorate 89(subpass_ms_f3) Binding 9
+                              Decorate 89(subpass_ms_f3) DescriptorSet 0
                               Decorate 89(subpass_ms_f3) InputAttachmentIndex 4
-                              Decorate 97(subpass_ms_i3) DescriptorSet 0
                               Decorate 97(subpass_ms_i3) Binding 10
+                              Decorate 97(subpass_ms_i3) DescriptorSet 0
                               Decorate 97(subpass_ms_i3) InputAttachmentIndex 5
-                              Decorate 105(subpass_ms_u3) DescriptorSet 0
                               Decorate 105(subpass_ms_u3) Binding 11
+                              Decorate 105(subpass_ms_u3) DescriptorSet 0
                               Decorate 105(subpass_ms_u3) InputAttachmentIndex 6
-                              Decorate 115(subpass_f2) DescriptorSet 0
                               Decorate 115(subpass_f2) Binding 12
+                              Decorate 115(subpass_f2) DescriptorSet 0
                               Decorate 115(subpass_f2) InputAttachmentIndex 1
-                              Decorate 123(subpass_i2) DescriptorSet 0
                               Decorate 123(subpass_i2) Binding 13
+                              Decorate 123(subpass_i2) DescriptorSet 0
                               Decorate 123(subpass_i2) InputAttachmentIndex 2
-                              Decorate 132(subpass_u2) DescriptorSet 0
                               Decorate 132(subpass_u2) Binding 14
+                              Decorate 132(subpass_u2) DescriptorSet 0
                               Decorate 132(subpass_u2) InputAttachmentIndex 3
-                              Decorate 139(subpass_ms_f2) DescriptorSet 0
                               Decorate 139(subpass_ms_f2) Binding 15
+                              Decorate 139(subpass_ms_f2) DescriptorSet 0
                               Decorate 139(subpass_ms_f2) InputAttachmentIndex 4
-                              Decorate 147(subpass_ms_i2) DescriptorSet 0
                               Decorate 147(subpass_ms_i2) Binding 16
+                              Decorate 147(subpass_ms_i2) DescriptorSet 0
                               Decorate 147(subpass_ms_i2) InputAttachmentIndex 5
-                              Decorate 154(subpass_ms_u2) DescriptorSet 0
                               Decorate 154(subpass_ms_u2) Binding 17
+                              Decorate 154(subpass_ms_u2) DescriptorSet 0
                               Decorate 154(subpass_ms_u2) InputAttachmentIndex 6
-                              Decorate 162(subpass_f) DescriptorSet 0
                               Decorate 162(subpass_f) Binding 18
+                              Decorate 162(subpass_f) DescriptorSet 0
                               Decorate 162(subpass_f) InputAttachmentIndex 1
-                              Decorate 168(subpass_i) DescriptorSet 0
                               Decorate 168(subpass_i) Binding 19
+                              Decorate 168(subpass_i) DescriptorSet 0
                               Decorate 168(subpass_i) InputAttachmentIndex 2
-                              Decorate 174(subpass_u) DescriptorSet 0
                               Decorate 174(subpass_u) Binding 20
+                              Decorate 174(subpass_u) DescriptorSet 0
                               Decorate 174(subpass_u) InputAttachmentIndex 3
-                              Decorate 179(subpass_ms_f) DescriptorSet 0
                               Decorate 179(subpass_ms_f) Binding 21
+                              Decorate 179(subpass_ms_f) DescriptorSet 0
                               Decorate 179(subpass_ms_f) InputAttachmentIndex 4
-                              Decorate 184(subpass_ms_i) DescriptorSet 0
                               Decorate 184(subpass_ms_i) Binding 22
+                              Decorate 184(subpass_ms_i) DescriptorSet 0
                               Decorate 184(subpass_ms_i) InputAttachmentIndex 5
-                              Decorate 189(subpass_ms_u) DescriptorSet 0
                               Decorate 189(subpass_ms_u) Binding 23
+                              Decorate 189(subpass_ms_u) DescriptorSet 0
                               Decorate 189(subpass_ms_u) InputAttachmentIndex 6
-                              Decorate 194(subpass_2) DescriptorSet 0
                               Decorate 194(subpass_2) Binding 24
+                              Decorate 194(subpass_2) DescriptorSet 0
                               Decorate 194(subpass_2) InputAttachmentIndex 7
                               Decorate 202(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.texture.struct.frag.out b/Test/baseResults/hlsl.texture.struct.frag.out
index ba632bed..879d0673 100644
--- a/Test/baseResults/hlsl.texture.struct.frag.out
+++ b/Test/baseResults/hlsl.texture.struct.frag.out
@@ -904,20 +904,20 @@ Validation failed
                               Name 229  "g_tTex2s1a"
                               Name 230  "param"
                               Name 238  "@entryPointOutput"
-                              Decorate 30(g_sSamp) DescriptorSet 0
                               Decorate 30(g_sSamp) Binding 0
-                              Decorate 90(g_tTex2s1) DescriptorSet 0
+                              Decorate 30(g_sSamp) DescriptorSet 0
                               Decorate 90(g_tTex2s1) Binding 1
-                              Decorate 114(g_tTex2s2) DescriptorSet 0
+                              Decorate 90(g_tTex2s1) DescriptorSet 0
                               Decorate 114(g_tTex2s2) Binding 2
-                              Decorate 140(g_tTex2s3) DescriptorSet 0
+                              Decorate 114(g_tTex2s2) DescriptorSet 0
                               Decorate 140(g_tTex2s3) Binding 3
-                              Decorate 168(g_tTex2s4) DescriptorSet 0
+                              Decorate 140(g_tTex2s3) DescriptorSet 0
                               Decorate 168(g_tTex2s4) Binding 4
-                              Decorate 202(g_tTex2s5) DescriptorSet 0
+                              Decorate 168(g_tTex2s4) DescriptorSet 0
                               Decorate 202(g_tTex2s5) Binding 5
-                              Decorate 229(g_tTex2s1a) DescriptorSet 0
+                              Decorate 202(g_tTex2s5) DescriptorSet 0
                               Decorate 229(g_tTex2s1a) Binding 6
+                              Decorate 229(g_tTex2s1a) DescriptorSet 0
                               Decorate 238(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.texture.subvec4.frag.out b/Test/baseResults/hlsl.texture.subvec4.frag.out
index 9c3b7417..715cb6d1 100644
--- a/Test/baseResults/hlsl.texture.subvec4.frag.out
+++ b/Test/baseResults/hlsl.texture.subvec4.frag.out
@@ -385,24 +385,24 @@ gl_FragCoord origin is upper left
                               Name 109  "g_tTex2df3"
                               Name 118  "g_tTex2df4"
                               Name 128  "@entryPointOutput"
-                              Decorate 17(g_tTex2dmsf1) DescriptorSet 0
                               Decorate 17(g_tTex2dmsf1) Binding 0
-                              Decorate 33(g_tTex2dmsf2) DescriptorSet 0
+                              Decorate 17(g_tTex2dmsf1) DescriptorSet 0
                               Decorate 33(g_tTex2dmsf2) Binding 1
-                              Decorate 43(g_tTex2dmsf3) DescriptorSet 0
+                              Decorate 33(g_tTex2dmsf2) DescriptorSet 0
                               Decorate 43(g_tTex2dmsf3) Binding 2
-                              Decorate 53(g_tTex2dmsf4) DescriptorSet 0
+                              Decorate 43(g_tTex2dmsf3) DescriptorSet 0
                               Decorate 53(g_tTex2dmsf4) Binding 3
-                              Decorate 88(g_tTex2df1) DescriptorSet 0
+                              Decorate 53(g_tTex2dmsf4) DescriptorSet 0
                               Decorate 88(g_tTex2df1) Binding 4
-                              Decorate 92(g_sSamp) DescriptorSet 0
+                              Decorate 88(g_tTex2df1) DescriptorSet 0
                               Decorate 92(g_sSamp) Binding 8
-                              Decorate 101(g_tTex2df2) DescriptorSet 0
+                              Decorate 92(g_sSamp) DescriptorSet 0
                               Decorate 101(g_tTex2df2) Binding 5
-                              Decorate 109(g_tTex2df3) DescriptorSet 0
+                              Decorate 101(g_tTex2df2) DescriptorSet 0
                               Decorate 109(g_tTex2df3) Binding 6
-                              Decorate 118(g_tTex2df4) DescriptorSet 0
+                              Decorate 109(g_tTex2df3) DescriptorSet 0
                               Decorate 118(g_tTex2df4) Binding 7
+                              Decorate 118(g_tTex2df4) DescriptorSet 0
                               Decorate 128(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.texturebuffer.frag.out b/Test/baseResults/hlsl.texturebuffer.frag.out
index ae1d4f75..7cba9c34 100644
--- a/Test/baseResults/hlsl.texturebuffer.frag.out
+++ b/Test/baseResults/hlsl.texturebuffer.frag.out
@@ -94,20 +94,20 @@ gl_FragCoord origin is upper left
                               Name 32  "pos"
                               Name 35  "@entryPointOutput"
                               Name 36  "param"
+                              Decorate 15(TextureBuffer_var) BufferBlock
                               MemberDecorate 15(TextureBuffer_var) 0 NonWritable
                               MemberDecorate 15(TextureBuffer_var) 0 Offset 0
                               MemberDecorate 15(TextureBuffer_var) 1 NonWritable
                               MemberDecorate 15(TextureBuffer_var) 1 Offset 16
-                              Decorate 15(TextureBuffer_var) BufferBlock
-                              Decorate 17(TextureBuffer_var) DescriptorSet 0
                               Decorate 17(TextureBuffer_var) Binding 0
+                              Decorate 17(TextureBuffer_var) DescriptorSet 0
+                              Decorate 22(tbuf2) BufferBlock
                               MemberDecorate 22(tbuf2) 0 NonWritable
                               MemberDecorate 22(tbuf2) 0 Offset 0
                               MemberDecorate 22(tbuf2) 1 NonWritable
                               MemberDecorate 22(tbuf2) 1 Offset 16
-                              Decorate 22(tbuf2) BufferBlock
-                              Decorate 24 DescriptorSet 0
                               Decorate 24 Binding 1
+                              Decorate 24 DescriptorSet 0
                               Decorate 32(pos) BuiltIn FragCoord
                               Decorate 35(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.tx.bracket.frag.out b/Test/baseResults/hlsl.tx.bracket.frag.out
index 07f19099..ad83b5f9 100644
--- a/Test/baseResults/hlsl.tx.bracket.frag.out
+++ b/Test/baseResults/hlsl.tx.bracket.frag.out
@@ -483,6 +483,7 @@ gl_FragCoord origin is upper left
                               Name 181  "g_tTex2df4a"
                               Name 184  "g_tTex2di4a"
                               Name 187  "g_tTex2du4a"
+                              Decorate 45($Global) Block
                               MemberDecorate 45($Global) 0 Offset 0
                               MemberDecorate 45($Global) 1 Offset 8
                               MemberDecorate 45($Global) 2 Offset 16
@@ -491,42 +492,41 @@ gl_FragCoord origin is upper left
                               MemberDecorate 45($Global) 5 Offset 56
                               MemberDecorate 45($Global) 6 Offset 64
                               MemberDecorate 45($Global) 7 Offset 80
-                              Decorate 45($Global) Block
-                              Decorate 47 DescriptorSet 0
                               Decorate 47 Binding 9
-                              Decorate 57(g_tTex1df4) DescriptorSet 0
+                              Decorate 47 DescriptorSet 0
                               Decorate 57(g_tTex1df4) Binding 0
-                              Decorate 72(g_tTex1di4) DescriptorSet 0
+                              Decorate 57(g_tTex1df4) DescriptorSet 0
                               Decorate 72(g_tTex1di4) Binding 1
-                              Decorate 80(g_tTex1du4) DescriptorSet 0
+                              Decorate 72(g_tTex1di4) DescriptorSet 0
                               Decorate 80(g_tTex1du4) Binding 2
-                              Decorate 88(g_tTex2df4) DescriptorSet 0
+                              Decorate 80(g_tTex1du4) DescriptorSet 0
                               Decorate 88(g_tTex2df4) Binding 3
-                              Decorate 98(g_tTex2di4) DescriptorSet 0
+                              Decorate 88(g_tTex2df4) DescriptorSet 0
                               Decorate 98(g_tTex2di4) Binding 4
-                              Decorate 106(g_tTex2du4) DescriptorSet 0
+                              Decorate 98(g_tTex2di4) DescriptorSet 0
                               Decorate 106(g_tTex2du4) Binding 5
-                              Decorate 114(g_tTex3df4) DescriptorSet 0
+                              Decorate 106(g_tTex2du4) DescriptorSet 0
                               Decorate 114(g_tTex3df4) Binding 6
-                              Decorate 124(g_tTex3di4) DescriptorSet 0
+                              Decorate 114(g_tTex3df4) DescriptorSet 0
                               Decorate 124(g_tTex3di4) Binding 7
-                              Decorate 132(g_tTex3du4) DescriptorSet 0
+                              Decorate 124(g_tTex3di4) DescriptorSet 0
                               Decorate 132(g_tTex3du4) Binding 8
+                              Decorate 132(g_tTex3du4) DescriptorSet 0
                               Decorate 164(@entryPointOutput.Color) Location 0
-                              Decorate 169(g_sSamp) DescriptorSet 0
                               Decorate 169(g_sSamp) Binding 0
-                              Decorate 172(g_tTex1df4a) DescriptorSet 0
+                              Decorate 169(g_sSamp) DescriptorSet 0
                               Decorate 172(g_tTex1df4a) Binding 0
-                              Decorate 175(g_tTex1di4a) DescriptorSet 0
+                              Decorate 172(g_tTex1df4a) DescriptorSet 0
                               Decorate 175(g_tTex1di4a) Binding 0
-                              Decorate 178(g_tTex1du4a) DescriptorSet 0
+                              Decorate 175(g_tTex1di4a) DescriptorSet 0
                               Decorate 178(g_tTex1du4a) Binding 0
-                              Decorate 181(g_tTex2df4a) DescriptorSet 0
+                              Decorate 178(g_tTex1du4a) DescriptorSet 0
                               Decorate 181(g_tTex2df4a) Binding 0
-                              Decorate 184(g_tTex2di4a) DescriptorSet 0
+                              Decorate 181(g_tTex2df4a) DescriptorSet 0
                               Decorate 184(g_tTex2di4a) Binding 0
-                              Decorate 187(g_tTex2du4a) DescriptorSet 0
+                              Decorate 184(g_tTex2di4a) DescriptorSet 0
                               Decorate 187(g_tTex2du4a) Binding 0
+                              Decorate 187(g_tTex2du4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/hlsl.tx.overload.frag.out b/Test/baseResults/hlsl.tx.overload.frag.out
index df1bb20f..88b38e8f 100644
--- a/Test/baseResults/hlsl.tx.overload.frag.out
+++ b/Test/baseResults/hlsl.tx.overload.frag.out
@@ -162,14 +162,14 @@ gl_FragCoord origin is upper left
                               Name 63  "twf4"
                               Name 64  "param"
                               Name 71  "@entryPointOutput"
-                              Decorate 45(tf1) DescriptorSet 0
                               Decorate 45(tf1) Binding 0
-                              Decorate 49(tf4) DescriptorSet 0
+                              Decorate 45(tf1) DescriptorSet 0
                               Decorate 49(tf4) Binding 1
-                              Decorate 56(twf1) DescriptorSet 0
+                              Decorate 49(tf4) DescriptorSet 0
                               Decorate 56(twf1) Binding 2
-                              Decorate 63(twf4) DescriptorSet 0
+                              Decorate 56(twf1) DescriptorSet 0
                               Decorate 63(twf4) Binding 3
+                              Decorate 63(twf4) DescriptorSet 0
                               Decorate 71(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.typeGraphCopy.vert.out b/Test/baseResults/hlsl.typeGraphCopy.vert.out
index e3805477..8f52cd66 100644
--- a/Test/baseResults/hlsl.typeGraphCopy.vert.out
+++ b/Test/baseResults/hlsl.typeGraphCopy.vert.out
@@ -93,10 +93,10 @@ Shader version: 500
                               MemberDecorate 13(N3) 0 Offset 0
                               MemberDecorate 13(N3) 1 Offset 32
                               MemberDecorate 13(N3) 2 Offset 48
-                              MemberDecorate 14($Global) 0 Offset 0
                               Decorate 14($Global) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14($Global) 0 Offset 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 26(@entryPointOutput) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.w-recip.frag.out b/Test/baseResults/hlsl.w-recip.frag.out
index a4fc494d..dc9bb111 100644
--- a/Test/baseResults/hlsl.w-recip.frag.out
+++ b/Test/baseResults/hlsl.w-recip.frag.out
@@ -183,11 +183,11 @@ gl_FragCoord origin is upper left
                               Name 53  "vpos"
                               Name 65  "@entryPointOutput"
                               Name 66  "param"
+                              Decorate 36($Global) Block
                               MemberDecorate 36($Global) 0 Offset 0
                               MemberDecorate 36($Global) 1 Offset 16
-                              Decorate 36($Global) Block
-                              Decorate 38 DescriptorSet 0
                               Decorate 38 Binding 0
+                              Decorate 38 DescriptorSet 0
                               Decorate 53(vpos) BuiltIn FragCoord
                               Decorate 65(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.w-recip2.frag.out b/Test/baseResults/hlsl.w-recip2.frag.out
index 2157ce4c..03312b8d 100644
--- a/Test/baseResults/hlsl.w-recip2.frag.out
+++ b/Test/baseResults/hlsl.w-recip2.frag.out
@@ -207,11 +207,11 @@ gl_FragCoord origin is upper left
                               Name 66  "VSOut.TexCoord"
                               Name 71  "@entryPointOutput"
                               Name 72  "param"
+                              Decorate 28($Global) Block
                               MemberDecorate 28($Global) 0 Offset 0
                               MemberDecorate 28($Global) 1 Offset 16
-                              Decorate 28($Global) Block
-                              Decorate 30 DescriptorSet 0
                               Decorate 30 Binding 0
+                              Decorate 30 DescriptorSet 0
                               Decorate 44(VSOut.PositionPS) BuiltIn FragCoord
                               Decorate 56(VSOut.PosInLightViewSpace) Location 0
                               Decorate 61(VSOut.NormalWS) Location 1
diff --git a/Test/baseResults/hlsl.wavebroadcast.comp.out b/Test/baseResults/hlsl.wavebroadcast.comp.out
index ed35cba3..667986cd 100644
--- a/Test/baseResults/hlsl.wavebroadcast.comp.out
+++ b/Test/baseResults/hlsl.wavebroadcast.comp.out
@@ -2330,10 +2330,10 @@ local_size = (32, 16, 1)
                               MemberDecorate 20(Types) 2 Offset 32
                               MemberDecorate 20(Types) 3 Offset 64
                               Decorate 21 ArrayStride 96
-                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 22(data) Block
-                              Decorate 24(data) DescriptorSet 0
+                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 24(data) Binding 0
+                              Decorate 24(data) DescriptorSet 0
                               Decorate 388(dti) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.waveprefix.comp.out b/Test/baseResults/hlsl.waveprefix.comp.out
index ecc1b3eb..e9ac1350 100644
--- a/Test/baseResults/hlsl.waveprefix.comp.out
+++ b/Test/baseResults/hlsl.waveprefix.comp.out
@@ -2354,10 +2354,10 @@ local_size = (32, 16, 1)
                               MemberDecorate 20(Types) 2 Offset 32
                               MemberDecorate 20(Types) 3 Offset 64
                               Decorate 21 ArrayStride 96
-                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 22(data) Block
-                              Decorate 24(data) DescriptorSet 0
+                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 24(data) Binding 0
+                              Decorate 24(data) DescriptorSet 0
                               Decorate 398(dti) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.wavequad.comp.out b/Test/baseResults/hlsl.wavequad.comp.out
index 7deb7c7e..338b4dc7 100644
--- a/Test/baseResults/hlsl.wavequad.comp.out
+++ b/Test/baseResults/hlsl.wavequad.comp.out
@@ -8057,10 +8057,10 @@ local_size = (32, 16, 1)
                               MemberDecorate 20(Types) 2 Offset 32
                               MemberDecorate 20(Types) 3 Offset 64
                               Decorate 21 ArrayStride 96
-                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 22(data) Block
-                              Decorate 24(data) DescriptorSet 0
+                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 24(data) Binding 0
+                              Decorate 24(data) DescriptorSet 0
                               Decorate 1227(dti) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.wavequery.comp.out b/Test/baseResults/hlsl.wavequery.comp.out
index 8e08b09e..015890af 100644
--- a/Test/baseResults/hlsl.wavequery.comp.out
+++ b/Test/baseResults/hlsl.wavequery.comp.out
@@ -78,10 +78,10 @@ local_size = (32, 16, 1)
                               Name 16  "@gl_SubgroupInvocationID"
                               Name 21  "@gl_SubgroupSize"
                               Decorate 9 ArrayStride 4
-                              MemberDecorate 10(data) 0 Offset 0
                               Decorate 10(data) Block
-                              Decorate 12(data) DescriptorSet 0
+                              MemberDecorate 10(data) 0 Offset 0
                               Decorate 12(data) Binding 0
+                              Decorate 12(data) DescriptorSet 0
                               Decorate 16(@gl_SubgroupInvocationID) BuiltIn SubgroupLocalInvocationId
                               Decorate 21(@gl_SubgroupSize) BuiltIn SubgroupSize
                2:             TypeVoid
diff --git a/Test/baseResults/hlsl.wavereduction.comp.out b/Test/baseResults/hlsl.wavereduction.comp.out
index 9a636f5a..81b24353 100644
--- a/Test/baseResults/hlsl.wavereduction.comp.out
+++ b/Test/baseResults/hlsl.wavereduction.comp.out
@@ -6218,10 +6218,10 @@ local_size = (32, 16, 1)
                               MemberDecorate 20(Types) 2 Offset 32
                               MemberDecorate 20(Types) 3 Offset 64
                               Decorate 21 ArrayStride 96
-                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 22(data) Block
-                              Decorate 24(data) DescriptorSet 0
+                              MemberDecorate 22(data) 0 Offset 0
                               Decorate 24(data) Binding 0
+                              Decorate 24(data) DescriptorSet 0
                               Decorate 986(dti) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.wavevote.comp.out b/Test/baseResults/hlsl.wavevote.comp.out
index 382f504f..adb0d9a1 100644
--- a/Test/baseResults/hlsl.wavevote.comp.out
+++ b/Test/baseResults/hlsl.wavevote.comp.out
@@ -227,10 +227,10 @@ local_size = (32, 16, 1)
                               Name 70  "dti"
                               Name 72  "param"
                               Decorate 14 ArrayStride 8
-                              MemberDecorate 15(data) 0 Offset 0
                               Decorate 15(data) Block
-                              Decorate 17(data) DescriptorSet 0
+                              MemberDecorate 15(data) 0 Offset 0
                               Decorate 17(data) Binding 0
+                              Decorate 17(data) DescriptorSet 0
                               Decorate 70(dti) BuiltIn GlobalInvocationId
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.y-negate-1.vert.out b/Test/baseResults/hlsl.y-negate-1.vert.out
index e0007524..43a49b6d 100644
--- a/Test/baseResults/hlsl.y-negate-1.vert.out
+++ b/Test/baseResults/hlsl.y-negate-1.vert.out
@@ -87,10 +87,10 @@ Shader version: 500
                               Name 13  ""
                               Name 22  "@position"
                               Name 32  "@entryPointOutput"
-                              MemberDecorate 11($Global) 0 Offset 0
                               Decorate 11($Global) Block
-                              Decorate 13 DescriptorSet 0
+                              MemberDecorate 11($Global) 0 Offset 0
                               Decorate 13 Binding 0
+                              Decorate 13 DescriptorSet 0
                               Decorate 32(@entryPointOutput) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.y-negate-2.vert.out b/Test/baseResults/hlsl.y-negate-2.vert.out
index 57a47ab7..98d71b96 100644
--- a/Test/baseResults/hlsl.y-negate-2.vert.out
+++ b/Test/baseResults/hlsl.y-negate-2.vert.out
@@ -98,10 +98,10 @@ Shader version: 500
                               Name 22  "param"
                               Name 25  "@position"
                               Name 35  "position"
-                              MemberDecorate 13($Global) 0 Offset 0
                               Decorate 13($Global) Block
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13($Global) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               Decorate 35(position) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/hlsl.y-negate-3.vert.out b/Test/baseResults/hlsl.y-negate-3.vert.out
index 3e589511..770e37fd 100644
--- a/Test/baseResults/hlsl.y-negate-3.vert.out
+++ b/Test/baseResults/hlsl.y-negate-3.vert.out
@@ -147,10 +147,10 @@ Shader version: 500
                               Name 33  "@position"
                               Name 44  "@entryPointOutput.pos"
                               Name 47  "@entryPointOutput.somethingelse"
-                              MemberDecorate 16($Global) 0 Offset 0
                               Decorate 16($Global) Block
-                              Decorate 18 DescriptorSet 0
+                              MemberDecorate 16($Global) 0 Offset 0
                               Decorate 18 Binding 0
+                              Decorate 18 DescriptorSet 0
                               Decorate 44(@entryPointOutput.pos) BuiltIn Position
                               Decorate 47(@entryPointOutput.somethingelse) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/iomap.blockOutVariableIn.2.vert.out b/Test/baseResults/iomap.blockOutVariableIn.2.vert.out
index 2c4ecdc5..49ad83e6 100644
--- a/Test/baseResults/iomap.blockOutVariableIn.2.vert.out
+++ b/Test/baseResults/iomap.blockOutVariableIn.2.vert.out
@@ -277,10 +277,10 @@ output primitive = triangle_strip
                               Name 32  "gl_InstanceID"
                               Decorate 9(Block) Block
                               Decorate 11 Location 0
+                              Decorate 26(gl_PerVertex) Block
                               MemberDecorate 26(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 26(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 26(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 26(gl_PerVertex) Block
                               Decorate 31(gl_VertexID) BuiltIn VertexId
                               Decorate 32(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
@@ -346,10 +346,10 @@ output primitive = triangle_strip
                               Decorate 14(in_a1) Location 0
                               Decorate 22(a2) Location 1
                               Decorate 25(in_a2) Location 1
+                              Decorate 31(gl_PerVertex) Block
                               MemberDecorate 31(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 31(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 31(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 31(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/iomap.blockOutVariableIn.vert.out b/Test/baseResults/iomap.blockOutVariableIn.vert.out
index a43e52f5..3ccf47b3 100644
--- a/Test/baseResults/iomap.blockOutVariableIn.vert.out
+++ b/Test/baseResults/iomap.blockOutVariableIn.vert.out
@@ -149,10 +149,10 @@ Shader version: 440
                               Name 32  "gl_InstanceID"
                               Decorate 9(Block) Block
                               Decorate 11 Location 0
+                              Decorate 26(gl_PerVertex) Block
                               MemberDecorate 26(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 26(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 26(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 26(gl_PerVertex) Block
                               Decorate 31(gl_VertexID) BuiltIn VertexId
                               Decorate 32(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
diff --git a/Test/baseResults/iomap.crossStage.2.vert.out b/Test/baseResults/iomap.crossStage.2.vert.out
index 171cc0e3..ffb10bc4 100644
--- a/Test/baseResults/iomap.crossStage.2.vert.out
+++ b/Test/baseResults/iomap.crossStage.2.vert.out
@@ -452,22 +452,22 @@ Shader version: 460
                               Decorate 36(um2) Location 4
                               Decorate 36(um2) DescriptorSet 0
                               Decorate 40(glass) Location 0
-                              Decorate 40(glass) DescriptorSet 0
                               Decorate 40(glass) Binding 0
+                              Decorate 40(glass) DescriptorSet 0
+                              Decorate 41(crossStageBlock1) Block
                               MemberDecorate 41(crossStageBlock1) 0 Offset 0
                               MemberDecorate 41(crossStageBlock1) 1 Offset 16
-                              Decorate 41(crossStageBlock1) Block
-                              Decorate 43 DescriptorSet 0
                               Decorate 43 Binding 0
-                              MemberDecorate 44(vertOnlyBlock) 0 Offset 0
+                              Decorate 43 DescriptorSet 0
                               Decorate 44(vertOnlyBlock) BufferBlock
-                              Decorate 46 DescriptorSet 0
+                              MemberDecorate 44(vertOnlyBlock) 0 Offset 0
                               Decorate 46 Binding 0
+                              Decorate 46 DescriptorSet 0
+                              Decorate 47(crossStageBlock2) Block
                               MemberDecorate 47(crossStageBlock2) 0 Offset 0
                               MemberDecorate 47(crossStageBlock2) 1 Offset 16
-                              Decorate 47(crossStageBlock2) Block
-                              Decorate 52(blockName1) DescriptorSet 0
                               Decorate 52(blockName1) Binding 0
+                              Decorate 52(blockName1) DescriptorSet 0
                               Decorate 54(gl_VertexID) BuiltIn VertexId
                               Decorate 55(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
@@ -575,11 +575,11 @@ Shader version: 460
                               Decorate 57(u2) DescriptorSet 0
                               Decorate 59(u3) Location 3
                               Decorate 59(u3) DescriptorSet 0
+                              Decorate 60(crossStageBlock2) Block
                               MemberDecorate 60(crossStageBlock2) 0 Offset 0
                               MemberDecorate 60(crossStageBlock2) 1 Offset 16
-                              Decorate 60(crossStageBlock2) Block
-                              Decorate 64(blockName1) DescriptorSet 0
                               Decorate 64(blockName1) Binding 0
+                              Decorate 64(blockName1) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
@@ -706,22 +706,22 @@ Shader version: 460
                               Decorate 45(um2) Location 4
                               Decorate 45(um2) DescriptorSet 0
                               Decorate 49(glass) Location 0
-                              Decorate 49(glass) DescriptorSet 0
                               Decorate 49(glass) Binding 0
+                              Decorate 49(glass) DescriptorSet 0
+                              Decorate 50(crossStageBlock1) Block
                               MemberDecorate 50(crossStageBlock1) 0 Offset 0
                               MemberDecorate 50(crossStageBlock1) 1 Offset 16
-                              Decorate 50(crossStageBlock1) Block
-                              Decorate 52 DescriptorSet 0
                               Decorate 52 Binding 0
-                              MemberDecorate 53(fragOnlyBlock) 0 Offset 0
+                              Decorate 52 DescriptorSet 0
                               Decorate 53(fragOnlyBlock) BufferBlock
-                              Decorate 55 DescriptorSet 0
+                              MemberDecorate 53(fragOnlyBlock) 0 Offset 0
                               Decorate 55 Binding 0
+                              Decorate 55 DescriptorSet 0
+                              Decorate 56(crossStageBlock2) Block
                               MemberDecorate 56(crossStageBlock2) 0 Offset 0
                               MemberDecorate 56(crossStageBlock2) 1 Offset 16
-                              Decorate 56(crossStageBlock2) Block
-                              Decorate 61(blockName2) DescriptorSet 0
                               Decorate 61(blockName2) Binding 0
+                              Decorate 61(blockName2) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/iomap.crossStage.vert.out b/Test/baseResults/iomap.crossStage.vert.out
index d6b6e4fe..e195b5b6 100644
--- a/Test/baseResults/iomap.crossStage.vert.out
+++ b/Test/baseResults/iomap.crossStage.vert.out
@@ -309,22 +309,22 @@ Shader version: 460
                               Decorate 36(um2) Location 4
                               Decorate 36(um2) DescriptorSet 0
                               Decorate 40(glass) Location 0
-                              Decorate 40(glass) DescriptorSet 0
                               Decorate 40(glass) Binding 0
+                              Decorate 40(glass) DescriptorSet 0
+                              Decorate 41(crossStageBlock1) Block
                               MemberDecorate 41(crossStageBlock1) 0 Offset 0
                               MemberDecorate 41(crossStageBlock1) 1 Offset 16
-                              Decorate 41(crossStageBlock1) Block
-                              Decorate 43 DescriptorSet 0
                               Decorate 43 Binding 0
-                              MemberDecorate 44(vertOnlyBlock) 0 Offset 0
+                              Decorate 43 DescriptorSet 0
                               Decorate 44(vertOnlyBlock) BufferBlock
-                              Decorate 46 DescriptorSet 0
+                              MemberDecorate 44(vertOnlyBlock) 0 Offset 0
                               Decorate 46 Binding 0
+                              Decorate 46 DescriptorSet 0
+                              Decorate 47(crossStageBlock2) Block
                               MemberDecorate 47(crossStageBlock2) 0 Offset 0
                               MemberDecorate 47(crossStageBlock2) 1 Offset 16
-                              Decorate 47(crossStageBlock2) Block
-                              Decorate 52(blockName1) DescriptorSet 0
                               Decorate 52(blockName1) Binding 0
+                              Decorate 52(blockName1) DescriptorSet 0
                               Decorate 54(gl_VertexID) BuiltIn VertexId
                               Decorate 55(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
@@ -434,22 +434,22 @@ Shader version: 460
                               Decorate 45(um2) Location 4
                               Decorate 45(um2) DescriptorSet 0
                               Decorate 49(glass) Location 0
-                              Decorate 49(glass) DescriptorSet 0
                               Decorate 49(glass) Binding 0
+                              Decorate 49(glass) DescriptorSet 0
+                              Decorate 50(crossStageBlock1) Block
                               MemberDecorate 50(crossStageBlock1) 0 Offset 0
                               MemberDecorate 50(crossStageBlock1) 1 Offset 16
-                              Decorate 50(crossStageBlock1) Block
-                              Decorate 52 DescriptorSet 0
                               Decorate 52 Binding 0
-                              MemberDecorate 53(fragOnlyBlock) 0 Offset 0
+                              Decorate 52 DescriptorSet 0
                               Decorate 53(fragOnlyBlock) BufferBlock
-                              Decorate 55 DescriptorSet 0
+                              MemberDecorate 53(fragOnlyBlock) 0 Offset 0
                               Decorate 55 Binding 0
+                              Decorate 55 DescriptorSet 0
+                              Decorate 56(crossStageBlock2) Block
                               MemberDecorate 56(crossStageBlock2) 0 Offset 0
                               MemberDecorate 56(crossStageBlock2) 1 Offset 16
-                              Decorate 56(crossStageBlock2) Block
-                              Decorate 61(blockName2) DescriptorSet 0
                               Decorate 61(blockName2) Binding 0
+                              Decorate 61(blockName2) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/iomap.crossStage.vk.vert.out b/Test/baseResults/iomap.crossStage.vk.vert.out
index dd8029d1..850b087f 100644
--- a/Test/baseResults/iomap.crossStage.vk.vert.out
+++ b/Test/baseResults/iomap.crossStage.vk.vert.out
@@ -411,23 +411,23 @@ gl_FragCoord origin is upper left
                               Decorate 14(vgo2) Location 1
                               Decorate 16(outBlock) Block
                               Decorate 18 Location 5
-                              Decorate 25(glass) DescriptorSet 0
                               Decorate 25(glass) Binding 0
+                              Decorate 25(glass) DescriptorSet 0
+                              Decorate 26(crossStageBlock1) Block
                               MemberDecorate 26(crossStageBlock1) 0 Offset 0
                               MemberDecorate 26(crossStageBlock1) 1 Offset 16
-                              Decorate 26(crossStageBlock1) Block
-                              Decorate 28 DescriptorSet 0
                               Decorate 28 Binding 1
+                              Decorate 28 DescriptorSet 0
+                              Decorate 29(vertOnlyBlock) BufferBlock
                               MemberDecorate 29(vertOnlyBlock) 0 NonWritable
                               MemberDecorate 29(vertOnlyBlock) 0 Offset 0
-                              Decorate 29(vertOnlyBlock) BufferBlock
-                              Decorate 31 DescriptorSet 0
                               Decorate 31 Binding 0
+                              Decorate 31 DescriptorSet 0
+                              Decorate 32(crossStageBlock2) Block
                               MemberDecorate 32(crossStageBlock2) 0 Offset 0
                               MemberDecorate 32(crossStageBlock2) 1 Offset 16
-                              Decorate 32(crossStageBlock2) Block
-                              Decorate 37(blockName1) DescriptorSet 0
                               Decorate 37(blockName1) Binding 3
+                              Decorate 37(blockName1) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -506,11 +506,11 @@ gl_FragCoord origin is upper left
                               Decorate 37(inBlock) Location 5
                               Decorate 48(vgo1) Location 0
                               Decorate 51(vgo2) Location 1
+                              Decorate 52(crossStageBlock2) Block
                               MemberDecorate 52(crossStageBlock2) 0 Offset 0
                               MemberDecorate 52(crossStageBlock2) 1 Offset 16
-                              Decorate 52(crossStageBlock2) Block
-                              Decorate 56(blockName1) DescriptorSet 0
                               Decorate 56(blockName1) Binding 3
+                              Decorate 56(blockName1) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
@@ -613,28 +613,28 @@ gl_FragCoord origin is upper left
                               Name 74  ""
                               Name 76  "gfo2"
                               Name 80  "glass"
+                              Decorate 15(fragOnlyBlock) BufferBlock
                               MemberDecorate 15(fragOnlyBlock) 0 NonWritable
                               MemberDecorate 15(fragOnlyBlock) 0 Offset 0
-                              Decorate 15(fragOnlyBlock) BufferBlock
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 2
+                              Decorate 17 DescriptorSet 0
+                              Decorate 23(crossStageBlock2) Block
                               MemberDecorate 23(crossStageBlock2) 0 Offset 0
                               MemberDecorate 23(crossStageBlock2) 1 Offset 16
-                              Decorate 23(crossStageBlock2) Block
-                              Decorate 28(blockName2) DescriptorSet 0
                               Decorate 28(blockName2) Binding 3
+                              Decorate 28(blockName2) DescriptorSet 0
+                              Decorate 38(crossStageBlock1) Block
                               MemberDecorate 38(crossStageBlock1) 0 Offset 0
                               MemberDecorate 38(crossStageBlock1) 1 Offset 16
-                              Decorate 38(crossStageBlock1) Block
-                              Decorate 40 DescriptorSet 0
                               Decorate 40 Binding 1
+                              Decorate 40 DescriptorSet 0
                               Decorate 64(gfo1) Location 0
                               Decorate 70(outColor) Location 0
                               Decorate 72(outBlock) Block
                               Decorate 74 Location 5
                               Decorate 76(gfo2) Location 1
-                              Decorate 80(glass) DescriptorSet 0
                               Decorate 80(glass) Binding 0
+                              Decorate 80(glass) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/iomap.variableOutBlockIn.2.vert.out b/Test/baseResults/iomap.variableOutBlockIn.2.vert.out
index 3e6d30b5..e638befd 100644
--- a/Test/baseResults/iomap.variableOutBlockIn.2.vert.out
+++ b/Test/baseResults/iomap.variableOutBlockIn.2.vert.out
@@ -169,10 +169,10 @@ output primitive = triangle_strip
                               Name 28  "gl_InstanceID"
                               Decorate 9(a1) Location 0
                               Decorate 14(a2) Location 1
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 27(gl_VertexID) BuiltIn VertexId
                               Decorate 28(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
@@ -234,10 +234,10 @@ output primitive = triangle_strip
                               Name 30  "gin"
                               Decorate 9(a1) Location 0
                               Decorate 14(a2) Location 1
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 26(Inputs) Block
                               Decorate 30(gin) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/iomap.variableOutBlockIn.vert.out b/Test/baseResults/iomap.variableOutBlockIn.vert.out
index 4b0ce649..d96df37a 100644
--- a/Test/baseResults/iomap.variableOutBlockIn.vert.out
+++ b/Test/baseResults/iomap.variableOutBlockIn.vert.out
@@ -147,10 +147,10 @@ Shader version: 440
                               Name 28  "gl_InstanceID"
                               Decorate 9(a1) Location 0
                               Decorate 14(a2) Location 1
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 27(gl_VertexID) BuiltIn VertexId
                               Decorate 28(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
diff --git a/Test/baseResults/link.vk.inconsistentGLPerVertex.0.vert.out b/Test/baseResults/link.vk.inconsistentGLPerVertex.0.vert.out
index d3545bfa..765fcccf 100755
--- a/Test/baseResults/link.vk.inconsistentGLPerVertex.0.vert.out
+++ b/Test/baseResults/link.vk.inconsistentGLPerVertex.0.vert.out
@@ -274,11 +274,11 @@ output primitive = triangle_strip
                               Name 27  "P"
                               Decorate 8(vs_output) Block
                               Decorate 10(vs_out) Location 0
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 20(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 27(P) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/link.vk.matchingPC.0.0.frag.out b/Test/baseResults/link.vk.matchingPC.0.0.frag.out
index 87d3b02c..d2101fde 100644
--- a/Test/baseResults/link.vk.matchingPC.0.0.frag.out
+++ b/Test/baseResults/link.vk.matchingPC.0.0.frag.out
@@ -109,10 +109,10 @@ gl_FragCoord origin is upper left
                               MemberName 16(PushConstantBlock) 2  "scale"
                               Name 18  "uPC"
                               Decorate 15(color) Location 0
+                              Decorate 16(PushConstantBlock) Block
                               MemberDecorate 16(PushConstantBlock) 0 Offset 0
                               MemberDecorate 16(PushConstantBlock) 1 Offset 16
                               MemberDecorate 16(PushConstantBlock) 2 Offset 32
-                              Decorate 16(PushConstantBlock) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/link.vk.multiBlocksValid.0.0.vert.out b/Test/baseResults/link.vk.multiBlocksValid.0.0.vert.out
index 7f9a05a7..b6638761 100644
--- a/Test/baseResults/link.vk.multiBlocksValid.0.0.vert.out
+++ b/Test/baseResults/link.vk.multiBlocksValid.0.0.vert.out
@@ -216,39 +216,39 @@ Shader version: 430
                               MemberName 70(BufferBlock) 0  "p"
                               Name 72  "uBuf"
                               Decorate 14(oColor) Location 2
+                              Decorate 16(ColorBlock) Block
                               MemberDecorate 16(ColorBlock) 0 Offset 0
                               MemberDecorate 16(ColorBlock) 1 Offset 16
                               MemberDecorate 16(ColorBlock) 2 Offset 32
                               MemberDecorate 16(ColorBlock) 3 Offset 48
-                              Decorate 16(ColorBlock) Block
-                              Decorate 18(uC) DescriptorSet 0
                               Decorate 18(uC) Binding 1
-                              MemberDecorate 26(SecondaryColorBlock) 0 Offset 0
+                              Decorate 18(uC) DescriptorSet 0
                               Decorate 26(SecondaryColorBlock) BufferBlock
-                              Decorate 28(uColorBuf) DescriptorSet 0
+                              MemberDecorate 26(SecondaryColorBlock) 0 Offset 0
                               Decorate 28(uColorBuf) Binding 0
+                              Decorate 28(uColorBuf) DescriptorSet 0
                               Decorate 32(Vertex) Block
                               Decorate 34(oV) Location 0
+                              Decorate 40(gl_PerVertex) Block
                               MemberDecorate 40(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 40(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 40(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 40(gl_PerVertex) Block
-                              MemberDecorate 44(MatrixBlock) 0 ColMajor
-                              MemberDecorate 44(MatrixBlock) 0 Offset 0
-                              MemberDecorate 44(MatrixBlock) 0 MatrixStride 16
-                              MemberDecorate 44(MatrixBlock) 1 ColMajor
-                              MemberDecorate 44(MatrixBlock) 1 Offset 64
-                              MemberDecorate 44(MatrixBlock) 1 MatrixStride 16
                               Decorate 44(MatrixBlock) Block
-                              Decorate 46(uM) DescriptorSet 0
+                              MemberDecorate 44(MatrixBlock) 0 ColMajor
+                              MemberDecorate 44(MatrixBlock) 0 MatrixStride 16
+                              MemberDecorate 44(MatrixBlock) 0 Offset 0
+                              MemberDecorate 44(MatrixBlock) 1 ColMajor
+                              MemberDecorate 44(MatrixBlock) 1 MatrixStride 16
+                              MemberDecorate 44(MatrixBlock) 1 Offset 64
                               Decorate 46(uM) Binding 0
+                              Decorate 46(uM) DescriptorSet 0
                               Decorate 65(P) Location 0
-                              MemberDecorate 70(BufferBlock) 0 ColMajor
-                              MemberDecorate 70(BufferBlock) 0 Offset 0
-                              MemberDecorate 70(BufferBlock) 0 MatrixStride 16
                               Decorate 70(BufferBlock) BufferBlock
-                              Decorate 72(uBuf) DescriptorSet 0
+                              MemberDecorate 70(BufferBlock) 0 ColMajor
+                              MemberDecorate 70(BufferBlock) 0 MatrixStride 16
+                              MemberDecorate 70(BufferBlock) 0 Offset 0
                               Decorate 72(uBuf) Binding 1
+                              Decorate 72(uBuf) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/link.vk.multiBlocksValid.1.0.geom.out b/Test/baseResults/link.vk.multiBlocksValid.1.0.geom.out
index 374a2a08..7c2b242c 100644
--- a/Test/baseResults/link.vk.multiBlocksValid.1.0.geom.out
+++ b/Test/baseResults/link.vk.multiBlocksValid.1.0.geom.out
@@ -310,36 +310,36 @@ output primitive = triangle_strip
                               Name 97  "uBuf"
                               Name 100  "P"
                               Decorate 18(oColor) Location 1
+                              Decorate 20(ColorBlock) Block
                               MemberDecorate 20(ColorBlock) 0 Offset 0
                               MemberDecorate 20(ColorBlock) 1 Offset 16
                               MemberDecorate 20(ColorBlock) 2 Offset 32
                               MemberDecorate 20(ColorBlock) 3 Offset 48
-                              Decorate 20(ColorBlock) Block
-                              Decorate 22(uC) DescriptorSet 0
                               Decorate 22(uC) Binding 1
+                              Decorate 22(uC) DescriptorSet 0
+                              Decorate 44(gl_PerVertex) Block
                               MemberDecorate 44(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 44(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 44(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 44(gl_PerVertex) Block
-                              MemberDecorate 48(MatrixBlock) 0 ColMajor
-                              MemberDecorate 48(MatrixBlock) 0 Offset 0
-                              MemberDecorate 48(MatrixBlock) 0 MatrixStride 16
-                              MemberDecorate 48(MatrixBlock) 1 ColMajor
-                              MemberDecorate 48(MatrixBlock) 1 Offset 64
-                              MemberDecorate 48(MatrixBlock) 1 MatrixStride 16
                               Decorate 48(MatrixBlock) Block
-                              Decorate 50(uM) DescriptorSet 0
+                              MemberDecorate 48(MatrixBlock) 0 ColMajor
+                              MemberDecorate 48(MatrixBlock) 0 MatrixStride 16
+                              MemberDecorate 48(MatrixBlock) 0 Offset 0
+                              MemberDecorate 48(MatrixBlock) 1 ColMajor
+                              MemberDecorate 48(MatrixBlock) 1 MatrixStride 16
+                              MemberDecorate 48(MatrixBlock) 1 Offset 64
                               Decorate 50(uM) Binding 0
+                              Decorate 50(uM) DescriptorSet 0
                               Decorate 59(Vertex) Block
                               Decorate 61(oV) Location 0
                               Decorate 64(Vertex) Block
                               Decorate 68(iV) Location 0
-                              MemberDecorate 95(BufferBlock) 0 ColMajor
-                              MemberDecorate 95(BufferBlock) 0 Offset 0
-                              MemberDecorate 95(BufferBlock) 0 MatrixStride 16
                               Decorate 95(BufferBlock) BufferBlock
-                              Decorate 97(uBuf) DescriptorSet 0
+                              MemberDecorate 95(BufferBlock) 0 ColMajor
+                              MemberDecorate 95(BufferBlock) 0 MatrixStride 16
+                              MemberDecorate 95(BufferBlock) 0 Offset 0
                               Decorate 97(uBuf) Binding 1
+                              Decorate 97(uBuf) DescriptorSet 0
                               Decorate 100(P) Location 2
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/link.vk.pcNamingValid.0.0.vert.out b/Test/baseResults/link.vk.pcNamingValid.0.0.vert.out
index 410f192e..74bc3fb6 100644
--- a/Test/baseResults/link.vk.pcNamingValid.0.0.vert.out
+++ b/Test/baseResults/link.vk.pcNamingValid.0.0.vert.out
@@ -135,20 +135,20 @@ Shader version: 450
                               Name 31  ""
                               Name 48  "P"
                               Decorate 14(oColor) Location 0
+                              Decorate 16(PCBlock) Block
                               MemberDecorate 16(PCBlock) 0 ColMajor
-                              MemberDecorate 16(PCBlock) 0 Offset 0
                               MemberDecorate 16(PCBlock) 0 MatrixStride 16
+                              MemberDecorate 16(PCBlock) 0 Offset 0
                               MemberDecorate 16(PCBlock) 1 ColMajor
-                              MemberDecorate 16(PCBlock) 1 Offset 64
                               MemberDecorate 16(PCBlock) 1 MatrixStride 16
+                              MemberDecorate 16(PCBlock) 1 Offset 64
                               MemberDecorate 16(PCBlock) 2 Offset 128
                               MemberDecorate 16(PCBlock) 3 Offset 144
-                              Decorate 16(PCBlock) Block
+                              Decorate 29(gl_PerVertex) Block
                               MemberDecorate 29(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 29(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 29(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 29(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 29(gl_PerVertex) Block
                               Decorate 48(P) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/link1.vk.frag.out b/Test/baseResults/link1.vk.frag.out
index 225aee13..a758f200 100644
--- a/Test/baseResults/link1.vk.frag.out
+++ b/Test/baseResults/link1.vk.frag.out
@@ -222,18 +222,18 @@ gl_FragCoord origin is upper left
                               MemberName 67(bnameImplicit) 0  "m"
                               Name 69  ""
                               Decorate 12(color) Location 0
-                              Decorate 53(s2D) DescriptorSet 0
                               Decorate 53(s2D) Binding 1
+                              Decorate 53(s2D) DescriptorSet 0
                               Decorate 61 ArrayStride 4
-                              MemberDecorate 62(bnameRuntime) 0 Offset 0
                               Decorate 62(bnameRuntime) BufferBlock
-                              Decorate 64 DescriptorSet 0
+                              MemberDecorate 62(bnameRuntime) 0 Offset 0
                               Decorate 64 Binding 0
+                              Decorate 64 DescriptorSet 0
                               Decorate 66 ArrayStride 4
-                              MemberDecorate 67(bnameImplicit) 0 Offset 0
                               Decorate 67(bnameImplicit) BufferBlock
-                              Decorate 69 DescriptorSet 0
+                              MemberDecorate 67(bnameImplicit) 0 Offset 0
                               Decorate 69 Binding 1
+                              Decorate 69 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/rayQuery-OpConvertUToAccelerationStructureKHR.comp.out b/Test/baseResults/rayQuery-OpConvertUToAccelerationStructureKHR.comp.out
index 007dcb90..e6bc9f56 100644
--- a/Test/baseResults/rayQuery-OpConvertUToAccelerationStructureKHR.comp.out
+++ b/Test/baseResults/rayQuery-OpConvertUToAccelerationStructureKHR.comp.out
@@ -17,8 +17,8 @@ rayQuery-OpConvertUToAccelerationStructureKHR.comp
                               Name 11  "params"
                               MemberName 11(params) 0  "tlas"
                               Name 13  ""
-                              MemberDecorate 11(params) 0 Offset 0
                               Decorate 11(params) Block
+                              MemberDecorate 11(params) 0 Offset 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeRayQueryKHR
diff --git a/Test/baseResults/rayQuery-allOps.comp.out b/Test/baseResults/rayQuery-allOps.comp.out
index a84d9196..9a606ed9 100644
--- a/Test/baseResults/rayQuery-allOps.comp.out
+++ b/Test/baseResults/rayQuery-allOps.comp.out
@@ -49,22 +49,22 @@ rayQuery-allOps.comp
                               Name 272  "Rays"
                               MemberName 272(Rays) 0  "rays"
                               Name 274  ""
+                              Decorate 15(Log) BufferBlock
                               MemberDecorate 15(Log) 0 Offset 0
                               MemberDecorate 15(Log) 1 Offset 4
-                              Decorate 15(Log) BufferBlock
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
-                              Decorate 50(rtas) DescriptorSet 0
+                              Decorate 17 DescriptorSet 0
                               Decorate 50(rtas) Binding 1
+                              Decorate 50(rtas) DescriptorSet 0
                               MemberDecorate 270(Ray) 0 Offset 0
                               MemberDecorate 270(Ray) 1 Offset 12
                               MemberDecorate 270(Ray) 2 Offset 16
                               MemberDecorate 270(Ray) 3 Offset 28
                               Decorate 271 ArrayStride 32
-                              MemberDecorate 272(Rays) 0 Offset 0
                               Decorate 272(Rays) BufferBlock
-                              Decorate 274 DescriptorSet 0
+                              MemberDecorate 272(Rays) 0 Offset 0
                               Decorate 274 Binding 2
+                              Decorate 274 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/rayQuery-allOps.frag.out b/Test/baseResults/rayQuery-allOps.frag.out
index 19a61711..814f9313 100644
--- a/Test/baseResults/rayQuery-allOps.frag.out
+++ b/Test/baseResults/rayQuery-allOps.frag.out
@@ -44,22 +44,22 @@ rayQuery-allOps.frag
                               Name 254  "Rays"
                               MemberName 254(Rays) 0  "rays"
                               Name 256  ""
+                              Decorate 15(Log) BufferBlock
                               MemberDecorate 15(Log) 0 Offset 0
                               MemberDecorate 15(Log) 1 Offset 4
-                              Decorate 15(Log) BufferBlock
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
-                              Decorate 50(rtas) DescriptorSet 0
+                              Decorate 17 DescriptorSet 0
                               Decorate 50(rtas) Binding 1
+                              Decorate 50(rtas) DescriptorSet 0
                               MemberDecorate 252(Ray) 0 Offset 0
                               MemberDecorate 252(Ray) 1 Offset 12
                               MemberDecorate 252(Ray) 2 Offset 16
                               MemberDecorate 252(Ray) 3 Offset 28
                               Decorate 253 ArrayStride 32
-                              MemberDecorate 254(Rays) 0 Offset 0
                               Decorate 254(Rays) BufferBlock
-                              Decorate 256 DescriptorSet 0
+                              MemberDecorate 254(Rays) 0 Offset 0
                               Decorate 256 Binding 2
+                              Decorate 256 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/rayQuery-allOps.rgen.out b/Test/baseResults/rayQuery-allOps.rgen.out
index 67447b9e..6b04403c 100644
--- a/Test/baseResults/rayQuery-allOps.rgen.out
+++ b/Test/baseResults/rayQuery-allOps.rgen.out
@@ -44,22 +44,22 @@ rayQuery-allOps.rgen
                               Name 254  "Rays"
                               MemberName 254(Rays) 0  "rays"
                               Name 256  ""
+                              Decorate 15(Log) BufferBlock
                               MemberDecorate 15(Log) 0 Offset 0
                               MemberDecorate 15(Log) 1 Offset 4
-                              Decorate 15(Log) BufferBlock
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
-                              Decorate 50(rtas) DescriptorSet 0
+                              Decorate 17 DescriptorSet 0
                               Decorate 50(rtas) Binding 1
+                              Decorate 50(rtas) DescriptorSet 0
                               MemberDecorate 252(Ray) 0 Offset 0
                               MemberDecorate 252(Ray) 1 Offset 12
                               MemberDecorate 252(Ray) 2 Offset 16
                               MemberDecorate 252(Ray) 3 Offset 28
                               Decorate 253 ArrayStride 32
-                              MemberDecorate 254(Rays) 0 Offset 0
                               Decorate 254(Rays) BufferBlock
-                              Decorate 256 DescriptorSet 0
+                              MemberDecorate 254(Rays) 0 Offset 0
                               Decorate 256 Binding 2
+                              Decorate 256 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/rayQuery-global.rgen.out b/Test/baseResults/rayQuery-global.rgen.out
index 968a178b..dfd98403 100644
--- a/Test/baseResults/rayQuery-global.rgen.out
+++ b/Test/baseResults/rayQuery-global.rgen.out
@@ -22,8 +22,8 @@ rayQuery-global.rgen
                               Name 22  "rq2"
                               Name 27  "rtas"
                               Name 40  "rq2"
-                              Decorate 27(rtas) DescriptorSet 0
                               Decorate 27(rtas) Binding 1
+                              Decorate 27(rtas) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeRayQueryKHR
diff --git a/Test/baseResults/rayQuery-initialize.rgen.out b/Test/baseResults/rayQuery-initialize.rgen.out
index dc213c5b..5e97f807 100644
--- a/Test/baseResults/rayQuery-initialize.rgen.out
+++ b/Test/baseResults/rayQuery-initialize.rgen.out
@@ -40,17 +40,17 @@ rayQuery-initialize.rgen
                               Name 90  "param"
                               Decorate 23(gl_LaunchIDNV) BuiltIn LaunchIdKHR
                               Decorate 28(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
-                              Decorate 50(rtas) DescriptorSet 0
                               Decorate 50(rtas) Binding 0
+                              Decorate 50(rtas) DescriptorSet 0
                               MemberDecorate 72(Ray) 0 Offset 0
                               MemberDecorate 72(Ray) 1 Offset 12
                               MemberDecorate 72(Ray) 2 Offset 16
                               MemberDecorate 72(Ray) 3 Offset 28
                               Decorate 73 ArrayStride 32
-                              MemberDecorate 74(Rays) 0 Offset 0
                               Decorate 74(Rays) BufferBlock
-                              Decorate 76 DescriptorSet 0
+                              MemberDecorate 74(Rays) 0 Offset 0
                               Decorate 76 Binding 2
+                              Decorate 76 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/rayQuery-no-cse.rgen.out b/Test/baseResults/rayQuery-no-cse.rgen.out
index 0a751a3c..eff4123f 100644
--- a/Test/baseResults/rayQuery-no-cse.rgen.out
+++ b/Test/baseResults/rayQuery-no-cse.rgen.out
@@ -42,17 +42,17 @@ rayQuery-no-cse.rgen
                               Name 104  "param"
                               Decorate 23(gl_LaunchIDNV) BuiltIn LaunchIdKHR
                               Decorate 28(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
-                              Decorate 50(rtas) DescriptorSet 0
                               Decorate 50(rtas) Binding 0
+                              Decorate 50(rtas) DescriptorSet 0
                               MemberDecorate 72(Ray) 0 Offset 0
                               MemberDecorate 72(Ray) 1 Offset 12
                               MemberDecorate 72(Ray) 2 Offset 16
                               MemberDecorate 72(Ray) 3 Offset 28
                               Decorate 73 ArrayStride 32
-                              MemberDecorate 74(Rays) 0 Offset 0
                               Decorate 74(Rays) BufferBlock
-                              Decorate 76 DescriptorSet 0
+                              MemberDecorate 74(Rays) 0 Offset 0
                               Decorate 76 Binding 2
+                              Decorate 76 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/rayQuery-types.comp.out b/Test/baseResults/rayQuery-types.comp.out
index bb7ed7bc..3a58ab50 100644
--- a/Test/baseResults/rayQuery-types.comp.out
+++ b/Test/baseResults/rayQuery-types.comp.out
@@ -34,8 +34,8 @@ rayQuery-types.comp
                               Name 73  "objRayOrigin"
                               Name 77  "objToWorld"
                               Name 79  "worldToObj"
-                              Decorate 11(tlas) DescriptorSet 0
                               Decorate 11(tlas) Binding 0
+                              Decorate 11(tlas) DescriptorSet 0
                               Decorate 85 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/rayQuery.rgen.out b/Test/baseResults/rayQuery.rgen.out
index 4a54973c..05ebd131 100644
--- a/Test/baseResults/rayQuery.rgen.out
+++ b/Test/baseResults/rayQuery.rgen.out
@@ -23,11 +23,11 @@ rayQuery.rgen
                               MemberName 26(block) 0  "dir"
                               MemberName 26(block) 1  "origin"
                               Name 28  ""
-                              Decorate 21(acc0) DescriptorSet 0
                               Decorate 21(acc0) Binding 0
+                              Decorate 21(acc0) DescriptorSet 0
+                              Decorate 26(block) BufferBlock
                               MemberDecorate 26(block) 0 Offset 0
                               MemberDecorate 26(block) 1 Offset 16
-                              Decorate 26(block) BufferBlock
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
index b1ce523b..a15675ea 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
@@ -12,32 +12,32 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented
                               EntryPoint Fragment 5663  "main" 4253 3709
                               ExecutionMode 5663 OriginUpperLeft
                               ExecutionMode 5663 DepthReplacing
-                              Decorate 4727 DescriptorSet 0
                               Decorate 4727 Binding 0
-                              Decorate 3305 DescriptorSet 0
+                              Decorate 4727 DescriptorSet 0
                               Decorate 3305 Binding 0
-                              Decorate 4743 DescriptorSet 0
+                              Decorate 3305 DescriptorSet 0
                               Decorate 4743 Binding 2
-                              Decorate 4807 DescriptorSet 0
+                              Decorate 4743 DescriptorSet 0
                               Decorate 4807 Binding 3
-                              Decorate 5042 DescriptorSet 0
+                              Decorate 4807 DescriptorSet 0
                               Decorate 5042 Binding 4
-                              Decorate 5058 DescriptorSet 0
+                              Decorate 5042 DescriptorSet 0
                               Decorate 5058 Binding 5
-                              Decorate 5122 DescriptorSet 0
+                              Decorate 5058 DescriptorSet 0
                               Decorate 5122 Binding 6
-                              Decorate 3967 DescriptorSet 0
+                              Decorate 5122 DescriptorSet 0
                               Decorate 3967 Binding 7
-                              Decorate 3983 DescriptorSet 0
+                              Decorate 3967 DescriptorSet 0
                               Decorate 3983 Binding 8
-                              Decorate 4047 DescriptorSet 0
+                              Decorate 3983 DescriptorSet 0
                               Decorate 4047 Binding 9
-                              Decorate 3789 DescriptorSet 0
+                              Decorate 4047 DescriptorSet 0
                               Decorate 3789 Binding 10
-                              Decorate 3805 DescriptorSet 0
+                              Decorate 3789 DescriptorSet 0
                               Decorate 3805 Binding 11
-                              Decorate 3869 DescriptorSet 0
+                              Decorate 3805 DescriptorSet 0
                               Decorate 3869 Binding 12
+                              Decorate 3869 DescriptorSet 0
                               Decorate 4253 Location 0
                               Decorate 3709 BuiltIn FragDepth
                8:             TypeVoid
diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
index 13ac4f26..5e61daae 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
@@ -64,40 +64,40 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented
                               Name 195  "g_sSamp2d"
                               Name 196  "g_sSamp2D_b"
                               Name 197  "g_tTex1df4a"
-                              Decorate 45(g_tTex1df4) DescriptorSet 0
                               Decorate 45(g_tTex1df4) Binding 0
-                              Decorate 49(g_sSamp) DescriptorSet 0
+                              Decorate 45(g_tTex1df4) DescriptorSet 0
                               Decorate 49(g_sSamp) Binding 0
-                              Decorate 60(g_tTex1di4) DescriptorSet 0
+                              Decorate 49(g_sSamp) DescriptorSet 0
                               Decorate 60(g_tTex1di4) Binding 2
-                              Decorate 73(g_tTex1du4) DescriptorSet 0
+                              Decorate 60(g_tTex1di4) DescriptorSet 0
                               Decorate 73(g_tTex1du4) Binding 3
-                              Decorate 83(g_tTex2df4) DescriptorSet 0
+                              Decorate 73(g_tTex1du4) DescriptorSet 0
                               Decorate 83(g_tTex2df4) Binding 4
-                              Decorate 94(g_tTex2di4) DescriptorSet 0
+                              Decorate 83(g_tTex2df4) DescriptorSet 0
                               Decorate 94(g_tTex2di4) Binding 5
-                              Decorate 105(g_tTex2du4) DescriptorSet 0
+                              Decorate 94(g_tTex2di4) DescriptorSet 0
                               Decorate 105(g_tTex2du4) Binding 6
-                              Decorate 117(g_tTex3df4) DescriptorSet 0
+                              Decorate 105(g_tTex2du4) DescriptorSet 0
                               Decorate 117(g_tTex3df4) Binding 7
-                              Decorate 128(g_tTex3di4) DescriptorSet 0
+                              Decorate 117(g_tTex3df4) DescriptorSet 0
                               Decorate 128(g_tTex3di4) Binding 8
-                              Decorate 138(g_tTex3du4) DescriptorSet 0
+                              Decorate 128(g_tTex3di4) DescriptorSet 0
                               Decorate 138(g_tTex3du4) Binding 9
-                              Decorate 151(g_tTexcdf4) DescriptorSet 0
+                              Decorate 138(g_tTex3du4) DescriptorSet 0
                               Decorate 151(g_tTexcdf4) Binding 10
-                              Decorate 160(g_tTexcdi4) DescriptorSet 0
+                              Decorate 151(g_tTexcdf4) DescriptorSet 0
                               Decorate 160(g_tTexcdi4) Binding 11
-                              Decorate 169(g_tTexcdu4) DescriptorSet 0
+                              Decorate 160(g_tTexcdi4) DescriptorSet 0
                               Decorate 169(g_tTexcdu4) Binding 12
+                              Decorate 169(g_tTexcdu4) DescriptorSet 0
                               Decorate 188(@entryPointOutput.Color) Location 0
                               Decorate 192(@entryPointOutput.Depth) BuiltIn FragDepth
-                              Decorate 195(g_sSamp2d) DescriptorSet 0
                               Decorate 195(g_sSamp2d) Binding 0
-                              Decorate 196(g_sSamp2D_b) DescriptorSet 0
+                              Decorate 195(g_sSamp2d) DescriptorSet 0
                               Decorate 196(g_sSamp2D_b) Binding 0
-                              Decorate 197(g_tTex1df4a) DescriptorSet 0
+                              Decorate 196(g_sSamp2D_b) DescriptorSet 0
                               Decorate 197(g_tTex1df4a) Binding 1
+                              Decorate 197(g_tTex1df4a) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
index d861a436..a9d041a8 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
@@ -12,40 +12,40 @@ WARNING: 0:4: 'immediate sampler state' : unimplemented
                               EntryPoint Fragment 4  "main" 188 192
                               ExecutionMode 4 OriginUpperLeft
                               ExecutionMode 4 DepthReplacing
-                              Decorate 45 DescriptorSet 0
                               Decorate 45 Binding 0
-                              Decorate 49 DescriptorSet 0
+                              Decorate 45 DescriptorSet 0
                               Decorate 49 Binding 0
-                              Decorate 60 DescriptorSet 0
+                              Decorate 49 DescriptorSet 0
                               Decorate 60 Binding 2
-                              Decorate 73 DescriptorSet 0
+                              Decorate 60 DescriptorSet 0
                               Decorate 73 Binding 3
-                              Decorate 83 DescriptorSet 0
+                              Decorate 73 DescriptorSet 0
                               Decorate 83 Binding 4
-                              Decorate 94 DescriptorSet 0
+                              Decorate 83 DescriptorSet 0
                               Decorate 94 Binding 5
-                              Decorate 105 DescriptorSet 0
+                              Decorate 94 DescriptorSet 0
                               Decorate 105 Binding 6
-                              Decorate 117 DescriptorSet 0
+                              Decorate 105 DescriptorSet 0
                               Decorate 117 Binding 7
-                              Decorate 128 DescriptorSet 0
+                              Decorate 117 DescriptorSet 0
                               Decorate 128 Binding 8
-                              Decorate 138 DescriptorSet 0
+                              Decorate 128 DescriptorSet 0
                               Decorate 138 Binding 9
-                              Decorate 151 DescriptorSet 0
+                              Decorate 138 DescriptorSet 0
                               Decorate 151 Binding 10
-                              Decorate 160 DescriptorSet 0
+                              Decorate 151 DescriptorSet 0
                               Decorate 160 Binding 11
-                              Decorate 169 DescriptorSet 0
+                              Decorate 160 DescriptorSet 0
                               Decorate 169 Binding 12
+                              Decorate 169 DescriptorSet 0
                               Decorate 188 Location 0
                               Decorate 192 BuiltIn FragDepth
-                              Decorate 195 DescriptorSet 0
                               Decorate 195 Binding 0
-                              Decorate 196 DescriptorSet 0
+                              Decorate 195 DescriptorSet 0
                               Decorate 196 Binding 0
-                              Decorate 197 DescriptorSet 0
+                              Decorate 196 DescriptorSet 0
                               Decorate 197 Binding 1
+                              Decorate 197 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/remap.uniformarray.none.frag.out b/Test/baseResults/remap.uniformarray.none.frag.out
index cc4fc7db..458d8c78 100644
--- a/Test/baseResults/remap.uniformarray.none.frag.out
+++ b/Test/baseResults/remap.uniformarray.none.frag.out
@@ -20,8 +20,8 @@ remap.uniformarray.none.frag
                               Decorate 25(inColor) Location 0
                               Decorate 43(alpha) Location 7
                               Decorate 54(gl_FragColor) Location 0
-                              Decorate 59(texSampler2D) DescriptorSet 0
                               Decorate 59(texSampler2D) Binding 0
+                              Decorate 59(texSampler2D) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.3.8bitstorage-ssbo.vert.out b/Test/baseResults/spv.1.3.8bitstorage-ssbo.vert.out
index 858a0dbe..59e05bad 100644
--- a/Test/baseResults/spv.1.3.8bitstorage-ssbo.vert.out
+++ b/Test/baseResults/spv.1.3.8bitstorage-ssbo.vert.out
@@ -19,11 +19,11 @@ spv.1.3.8bitstorage-ssbo.vert
                               Name 18  "gl_VertexIndex"
                               Decorate 9(color) Location 0
                               Decorate 11 ArrayStride 1
+                              Decorate 12(Vertices) Block
                               MemberDecorate 12(Vertices) 0 NonWritable
                               MemberDecorate 12(Vertices) 0 Offset 0
-                              Decorate 12(Vertices) Block
-                              Decorate 14 DescriptorSet 0
                               Decorate 14 Binding 0
+                              Decorate 14 DescriptorSet 0
                               Decorate 18(gl_VertexIndex) BuiltIn VertexIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.3.8bitstorage-ubo.vert.out b/Test/baseResults/spv.1.3.8bitstorage-ubo.vert.out
index e7ec5ed3..2aa51a8e 100644
--- a/Test/baseResults/spv.1.3.8bitstorage-ubo.vert.out
+++ b/Test/baseResults/spv.1.3.8bitstorage-ubo.vert.out
@@ -19,10 +19,10 @@ spv.1.3.8bitstorage-ubo.vert
                               Name 20  "gl_VertexIndex"
                               Decorate 9(color) Location 0
                               Decorate 13 ArrayStride 16
-                              MemberDecorate 14(Vertices) 0 Offset 0
                               Decorate 14(Vertices) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(Vertices) 0 Offset 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 20(gl_VertexIndex) BuiltIn VertexIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.3.coopmat.comp.out b/Test/baseResults/spv.1.3.coopmat.comp.out
index 6b15772d..b14f0577 100644
--- a/Test/baseResults/spv.1.3.coopmat.comp.out
+++ b/Test/baseResults/spv.1.3.coopmat.comp.out
@@ -26,11 +26,11 @@ spv.1.3.coopmat.comp
                               Name 35  "block"
                               Decorate 31 ArrayStride 4
                               Decorate 32 ArrayStride 4
+                              Decorate 33(Block) Block
                               MemberDecorate 33(Block) 0 Offset 0
                               MemberDecorate 33(Block) 1 Offset 4194304
-                              Decorate 33(Block) Block
-                              Decorate 35(block) DescriptorSet 0
                               Decorate 35(block) Binding 0
+                              Decorate 35(block) DescriptorSet 0
                               Decorate 51 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.4.OpCopyLogical.comp.out b/Test/baseResults/spv.1.4.OpCopyLogical.comp.out
index ad0397b3..f82a144c 100644
--- a/Test/baseResults/spv.1.4.OpCopyLogical.comp.out
+++ b/Test/baseResults/spv.1.4.OpCopyLogical.comp.out
@@ -48,35 +48,35 @@ spv.1.4.OpCopyLogical.comp
                               Decorate 15 ArrayStride 8
                               MemberDecorate 16(MyStruct) 0 Offset 0
                               MemberDecorate 16(MyStruct) 1 Offset 16
-                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 17(SSBO0) Block
-                              Decorate 19(inBuf) DescriptorSet 0
+                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 19(inBuf) Binding 0
-                              MemberDecorate 25(SSBO1) 0 Offset 0
+                              Decorate 19(inBuf) DescriptorSet 0
                               Decorate 25(SSBO1) Block
-                              Decorate 27(outBuf) DescriptorSet 0
+                              MemberDecorate 25(SSBO1) 0 Offset 0
                               Decorate 27(outBuf) Binding 1
+                              Decorate 27(outBuf) DescriptorSet 0
                               Decorate 31 ArrayStride 16
                               MemberDecorate 32(MyStruct) 0 Offset 0
                               MemberDecorate 32(MyStruct) 1 Offset 32
-                              MemberDecorate 33(UBO) 0 Offset 0
                               Decorate 33(UBO) Block
-                              Decorate 35(uBuf) DescriptorSet 0
+                              MemberDecorate 33(UBO) 0 Offset 0
                               Decorate 35(uBuf) Binding 2
+                              Decorate 35(uBuf) DescriptorSet 0
                               Decorate 47 ArrayStride 48
                               MemberDecorate 48(Nested) 0 Offset 0
                               MemberDecorate 48(Nested) 1 Offset 16
-                              MemberDecorate 49(UBON) 0 Offset 0
                               Decorate 49(UBON) Block
-                              Decorate 51(uBufN) DescriptorSet 0
+                              MemberDecorate 49(UBON) 0 Offset 0
                               Decorate 51(uBufN) Binding 2
+                              Decorate 51(uBufN) DescriptorSet 0
                               Decorate 56 ArrayStride 24
                               MemberDecorate 57(Nested) 0 Offset 0
                               MemberDecorate 57(Nested) 1 Offset 8
-                              MemberDecorate 58(SSBO1N) 0 Offset 0
                               Decorate 58(SSBO1N) Block
-                              Decorate 60(outBufN) DescriptorSet 0
+                              MemberDecorate 58(SSBO1N) 0 Offset 0
                               Decorate 60(outBufN) Binding 1
+                              Decorate 60(outBufN) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.OpCopyLogical.funcall.frag.out b/Test/baseResults/spv.1.4.OpCopyLogical.funcall.frag.out
index 850ee915..c37bca66 100644
--- a/Test/baseResults/spv.1.4.OpCopyLogical.funcall.frag.out
+++ b/Test/baseResults/spv.1.4.OpCopyLogical.funcall.frag.out
@@ -30,12 +30,12 @@ spv.1.4.OpCopyLogical.funcall.frag
                               Name 47  "param"
                               Name 55  "param"
                               MemberDecorate 22(S) 0 ColMajor
-                              MemberDecorate 22(S) 0 Offset 0
                               MemberDecorate 22(S) 0 MatrixStride 16
-                              MemberDecorate 23(blockName) 0 Offset 0
+                              MemberDecorate 22(S) 0 Offset 0
                               Decorate 23(blockName) Block
-                              Decorate 25 DescriptorSet 0
+                              MemberDecorate 23(blockName) 0 Offset 0
                               Decorate 25 Binding 0
+                              Decorate 25 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.OpCopyLogicalBool.comp.out b/Test/baseResults/spv.1.4.OpCopyLogicalBool.comp.out
index 7b525959..0e6f6a61 100644
--- a/Test/baseResults/spv.1.4.OpCopyLogicalBool.comp.out
+++ b/Test/baseResults/spv.1.4.OpCopyLogicalBool.comp.out
@@ -48,35 +48,35 @@ spv.1.4.OpCopyLogicalBool.comp
                               Decorate 15 ArrayStride 8
                               MemberDecorate 16(MyStruct) 0 Offset 0
                               MemberDecorate 16(MyStruct) 1 Offset 16
-                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 17(SSBO0) Block
-                              Decorate 19(inBuf) DescriptorSet 0
+                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 19(inBuf) Binding 0
-                              MemberDecorate 35(SSBO1) 0 Offset 0
+                              Decorate 19(inBuf) DescriptorSet 0
                               Decorate 35(SSBO1) Block
-                              Decorate 37(outBuf) DescriptorSet 0
+                              MemberDecorate 35(SSBO1) 0 Offset 0
                               Decorate 37(outBuf) Binding 1
+                              Decorate 37(outBuf) DescriptorSet 0
                               Decorate 49 ArrayStride 16
                               MemberDecorate 50(MyStruct) 0 Offset 0
                               MemberDecorate 50(MyStruct) 1 Offset 32
-                              MemberDecorate 51(UBO) 0 Offset 0
                               Decorate 51(UBO) Block
-                              Decorate 53(uBuf) DescriptorSet 0
+                              MemberDecorate 51(UBO) 0 Offset 0
                               Decorate 53(uBuf) Binding 2
+                              Decorate 53(uBuf) DescriptorSet 0
                               Decorate 75 ArrayStride 48
                               MemberDecorate 76(Nested) 0 Offset 0
                               MemberDecorate 76(Nested) 1 Offset 16
-                              MemberDecorate 77(UBON) 0 Offset 0
                               Decorate 77(UBON) Block
-                              Decorate 79(uBufN) DescriptorSet 0
+                              MemberDecorate 77(UBON) 0 Offset 0
                               Decorate 79(uBufN) Binding 2
+                              Decorate 79(uBufN) DescriptorSet 0
                               Decorate 105 ArrayStride 24
                               MemberDecorate 106(Nested) 0 Offset 0
                               MemberDecorate 106(Nested) 1 Offset 8
-                              MemberDecorate 107(SSBO1N) 0 Offset 0
                               Decorate 107(SSBO1N) Block
-                              Decorate 109(outBufN) DescriptorSet 0
+                              MemberDecorate 107(SSBO1N) 0 Offset 0
                               Decorate 109(outBufN) Binding 1
+                              Decorate 109(outBufN) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.OpEntryPoint.frag.out b/Test/baseResults/spv.1.4.OpEntryPoint.frag.out
index f37b0fdf..dd7dbbb9 100644
--- a/Test/baseResults/spv.1.4.OpEntryPoint.frag.out
+++ b/Test/baseResults/spv.1.4.OpEntryPoint.frag.out
@@ -25,16 +25,16 @@ spv.1.4.OpEntryPoint.frag
                               Name 41  "bufferv"
                               Decorate 11(inv) Location 0
                               Decorate 17(outv) Location 0
-                              MemberDecorate 23(ubt) 0 Offset 0
                               Decorate 23(ubt) Block
-                              Decorate 25(uniformv) DescriptorSet 0
+                              MemberDecorate 23(ubt) 0 Offset 0
                               Decorate 25(uniformv) Binding 0
-                              MemberDecorate 31(pushB) 0 Offset 0
+                              Decorate 25(uniformv) DescriptorSet 0
                               Decorate 31(pushB) Block
-                              MemberDecorate 39(bbt) 0 Offset 0
+                              MemberDecorate 31(pushB) 0 Offset 0
                               Decorate 39(bbt) Block
-                              Decorate 41(bufferv) DescriptorSet 0
+                              MemberDecorate 39(bbt) 0 Offset 0
                               Decorate 41(bufferv) Binding 1
+                              Decorate 41(bufferv) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.OpEntryPoint.opaqueParams.vert.out b/Test/baseResults/spv.1.4.OpEntryPoint.opaqueParams.vert.out
index dff799f0..4a394014 100644
--- a/Test/baseResults/spv.1.4.OpEntryPoint.opaqueParams.vert.out
+++ b/Test/baseResults/spv.1.4.OpEntryPoint.opaqueParams.vert.out
@@ -18,12 +18,12 @@ spv.1.4.OpEntryPoint.opaqueParams.vert
                               Name 41  "s2D"
                               Name 42  "t2D"
                               Name 43  "s"
-                              Decorate 41(s2D) DescriptorSet 0
                               Decorate 41(s2D) Binding 0
-                              Decorate 42(t2D) DescriptorSet 0
+                              Decorate 41(s2D) DescriptorSet 0
                               Decorate 42(t2D) Binding 1
-                              Decorate 43(s) DescriptorSet 0
+                              Decorate 42(t2D) DescriptorSet 0
                               Decorate 43(s) Binding 3
+                              Decorate 43(s) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.constructComposite.comp.out b/Test/baseResults/spv.1.4.constructComposite.comp.out
index e896cf80..d228e20d 100644
--- a/Test/baseResults/spv.1.4.constructComposite.comp.out
+++ b/Test/baseResults/spv.1.4.constructComposite.comp.out
@@ -27,10 +27,10 @@ spv.1.4.constructComposite.comp
                               MemberDecorate 11(sA) 0 Offset 0
                               MemberDecorate 11(sA) 1 Offset 4
                               MemberDecorate 12(sB) 0 Offset 0
-                              MemberDecorate 13(ubo) 0 Offset 0
                               Decorate 13(ubo) Block
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13(ubo) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               Decorate 26 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.4.funcall.array.frag.out b/Test/baseResults/spv.1.4.funcall.array.frag.out
index 6a23f2aa..a7fec762 100644
--- a/Test/baseResults/spv.1.4.funcall.array.frag.out
+++ b/Test/baseResults/spv.1.4.funcall.array.frag.out
@@ -22,10 +22,10 @@ spv.1.4.funcall.array.frag
                               Name 40  "param"
                               Decorate 27(color) Location 0
                               Decorate 28 ArrayStride 16
-                              MemberDecorate 29(ub) 0 Offset 0
                               Decorate 29(ub) Block
-                              Decorate 31 DescriptorSet 0
+                              MemberDecorate 29(ub) 0 Offset 0
                               Decorate 31 Binding 0
+                              Decorate 31 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.4.image.frag.out b/Test/baseResults/spv.1.4.image.frag.out
index 059ed196..5feb0daf 100644
--- a/Test/baseResults/spv.1.4.image.frag.out
+++ b/Test/baseResults/spv.1.4.image.frag.out
@@ -23,20 +23,20 @@ spv.1.4.image.frag
                               Name 89  "ui2DMS"
                               Name 100  "fragData"
                               Name 103  "value"
-                              Decorate 26(i2D) DescriptorSet 0
                               Decorate 26(i2D) Binding 1
+                              Decorate 26(i2D) DescriptorSet 0
                               Decorate 30(ic2D) Flat
                               Decorate 30(ic2D) Location 0
-                              Decorate 40(ii2D) DescriptorSet 0
                               Decorate 40(ii2D) Binding 12
-                              Decorate 52(ui2D) DescriptorSet 0
+                              Decorate 40(ii2D) DescriptorSet 0
                               Decorate 52(ui2D) Binding 12
-                              Decorate 64(i2DMS) DescriptorSet 0
+                              Decorate 52(ui2D) DescriptorSet 0
                               Decorate 64(i2DMS) Binding 9
-                              Decorate 77(ii2DMS) DescriptorSet 0
+                              Decorate 64(i2DMS) DescriptorSet 0
                               Decorate 77(ii2DMS) Binding 13
-                              Decorate 89(ui2DMS) DescriptorSet 0
+                              Decorate 77(ii2DMS) DescriptorSet 0
                               Decorate 89(ui2DMS) Binding 13
+                              Decorate 89(ui2DMS) DescriptorSet 0
                               Decorate 100(fragData) Location 0
                               Decorate 103(value) Flat
                               Decorate 103(value) Location 1
diff --git a/Test/baseResults/spv.1.4.load.bool.array.interface.block.frag.out b/Test/baseResults/spv.1.4.load.bool.array.interface.block.frag.out
index fea83ab3..507434fd 100644
--- a/Test/baseResults/spv.1.4.load.bool.array.interface.block.frag.out
+++ b/Test/baseResults/spv.1.4.load.bool.array.interface.block.frag.out
@@ -20,16 +20,16 @@ Validation failed
                               Name 61  "color"
                               Decorate 8 ArrayStride 4
                               Decorate 10 ArrayStride 12
-                              MemberDecorate 11(ssbo) 0 Offset 0
                               Decorate 11(ssbo) Block
-                              Decorate 13 DescriptorSet 0
+                              MemberDecorate 11(ssbo) 0 Offset 0
                               Decorate 13 Binding 1
+                              Decorate 13 DescriptorSet 0
                               Decorate 16 ArrayStride 16
                               Decorate 17 ArrayStride 48
-                              MemberDecorate 18(ub) 0 Offset 0
                               Decorate 18(ub) Block
-                              Decorate 20 DescriptorSet 0
+                              MemberDecorate 18(ub) 0 Offset 0
                               Decorate 20 Binding 0
+                              Decorate 20 DescriptorSet 0
                               Decorate 61(color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.4.sparseTexture.frag.out b/Test/baseResults/spv.1.4.sparseTexture.frag.out
index a26ae66e..214a02f8 100644
--- a/Test/baseResults/spv.1.4.sparseTexture.frag.out
+++ b/Test/baseResults/spv.1.4.sparseTexture.frag.out
@@ -47,21 +47,21 @@ spv.1.4.sparseTexture.frag
                               Name 206  "c3"
                               Name 208  "c4"
                               Name 212  "offsets"
-                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 29(s2D) Binding 0
+                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 33(c2) Location 0
-                              Decorate 46(is2D) DescriptorSet 0
                               Decorate 46(is2D) Binding 1
-                              Decorate 63(us2D) DescriptorSet 0
+                              Decorate 46(is2D) DescriptorSet 0
                               Decorate 63(us2D) Binding 2
-                              Decorate 149(i2D) DescriptorSet 0
+                              Decorate 63(us2D) DescriptorSet 0
                               Decorate 149(i2D) Binding 3
+                              Decorate 149(i2D) DescriptorSet 0
                               Decorate 152(ic2) Flat
                               Decorate 152(ic2) Location 3
-                              Decorate 162(ii2DMS) DescriptorSet 0
                               Decorate 162(ii2DMS) Binding 4
-                              Decorate 177(ui3D) DescriptorSet 0
+                              Decorate 162(ii2DMS) DescriptorSet 0
                               Decorate 177(ui3D) Binding 5
+                              Decorate 177(ui3D) DescriptorSet 0
                               Decorate 181(ic3) Flat
                               Decorate 181(ic3) Location 4
                               Decorate 189(outColor) Location 0
diff --git a/Test/baseResults/spv.1.4.texture.frag.out b/Test/baseResults/spv.1.4.texture.frag.out
index 6d28e1f0..352b9210 100644
--- a/Test/baseResults/spv.1.4.texture.frag.out
+++ b/Test/baseResults/spv.1.4.texture.frag.out
@@ -19,13 +19,13 @@ spv.1.4.texture.frag
                               Name 54  "iLod"
                               Name 76  "t"
                               Name 78  "color"
-                              Decorate 15(texSampler2D) DescriptorSet 0
                               Decorate 15(texSampler2D) Binding 0
+                              Decorate 15(texSampler2D) DescriptorSet 0
                               Decorate 19(coords2D) Location 1
-                              Decorate 28(itexSampler2D) DescriptorSet 0
                               Decorate 28(itexSampler2D) Binding 1
-                              Decorate 40(utexSampler2D) DescriptorSet 0
+                              Decorate 28(itexSampler2D) DescriptorSet 0
                               Decorate 40(utexSampler2D) Binding 2
+                              Decorate 40(utexSampler2D) DescriptorSet 0
                               Decorate 51(iCoords2D) Flat
                               Decorate 51(iCoords2D) Location 2
                               Decorate 54(iLod) Flat
diff --git a/Test/baseResults/spv.1.6.conditionalDiscard.frag.out b/Test/baseResults/spv.1.6.conditionalDiscard.frag.out
index 6364773d..aa631f3a 100644
--- a/Test/baseResults/spv.1.6.conditionalDiscard.frag.out
+++ b/Test/baseResults/spv.1.6.conditionalDiscard.frag.out
@@ -14,8 +14,8 @@ spv.1.6.conditionalDiscard.frag
                               Name 13  "tex"
                               Name 17  "coord"
                               Name 34  "gl_FragColor"
-                              Decorate 13(tex) DescriptorSet 0
                               Decorate 13(tex) Binding 0
+                              Decorate 13(tex) DescriptorSet 0
                               Decorate 17(coord) Location 0
                               Decorate 34(gl_FragColor) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.1.6.helperInvocation.memmodel.frag.out b/Test/baseResults/spv.1.6.helperInvocation.memmodel.frag.out
index fea4e458..10ca5df2 100644
--- a/Test/baseResults/spv.1.6.helperInvocation.memmodel.frag.out
+++ b/Test/baseResults/spv.1.6.helperInvocation.memmodel.frag.out
@@ -18,10 +18,10 @@ spv.1.6.helperInvocation.memmodel.frag
                               MemberName 7(B) 0  "o"
                               Name 9  ""
                               Name 14  "gl_HelperInvocation"
-                              MemberDecorate 7(B) 0 Offset 0
                               Decorate 7(B) Block
-                              Decorate 9 DescriptorSet 0
+                              MemberDecorate 7(B) 0 Offset 0
                               Decorate 9 Binding 0
+                              Decorate 9 DescriptorSet 0
                               Decorate 14(gl_HelperInvocation) BuiltIn HelperInvocation
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.1.6.samplerBuffer.frag.out b/Test/baseResults/spv.1.6.samplerBuffer.frag.out
index 1bd52da9..eef89e93 100644
--- a/Test/baseResults/spv.1.6.samplerBuffer.frag.out
+++ b/Test/baseResults/spv.1.6.samplerBuffer.frag.out
@@ -15,8 +15,8 @@ spv.1.6.samplerBuffer.frag
                               Name 9  "o"
                               Name 13  "sampB"
                               Decorate 9(o) Location 0
-                              Decorate 13(sampB) DescriptorSet 0
                               Decorate 13(sampB) Binding 0
+                              Decorate 13(sampB) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.6.separate.frag.out b/Test/baseResults/spv.1.6.separate.frag.out
index f485fad1..3037fab1 100644
--- a/Test/baseResults/spv.1.6.separate.frag.out
+++ b/Test/baseResults/spv.1.6.separate.frag.out
@@ -15,14 +15,14 @@ spv.1.6.separate.frag
                               Name 13  "s"
                               Name 18  "itexBuffer"
                               Name 24  "utexBuffer"
-                              Decorate 9(texBuffer) DescriptorSet 0
                               Decorate 9(texBuffer) Binding 1
-                              Decorate 13(s) DescriptorSet 0
+                              Decorate 9(texBuffer) DescriptorSet 0
                               Decorate 13(s) Binding 0
-                              Decorate 18(itexBuffer) DescriptorSet 0
+                              Decorate 13(s) DescriptorSet 0
                               Decorate 18(itexBuffer) Binding 2
-                              Decorate 24(utexBuffer) DescriptorSet 0
+                              Decorate 18(itexBuffer) DescriptorSet 0
                               Decorate 24(utexBuffer) Binding 3
+                              Decorate 24(utexBuffer) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.1.6.specConstant.comp.out b/Test/baseResults/spv.1.6.specConstant.comp.out
index 2c32fbd6..13eb93c6 100644
--- a/Test/baseResults/spv.1.6.specConstant.comp.out
+++ b/Test/baseResults/spv.1.6.specConstant.comp.out
@@ -18,10 +18,10 @@ spv.1.6.specConstant.comp
                               Name 37  "param"
                               Decorate 7 SpecId 18
                               Decorate 9 SpecId 19
-                              MemberDecorate 16(bn) 0 Offset 0
                               Decorate 16(bn) Block
-                              Decorate 18(bi) DescriptorSet 0
+                              MemberDecorate 16(bn) 0 Offset 0
                               Decorate 18(bi) Binding 0
+                              Decorate 18(bi) DescriptorSet 0
                               Decorate 25 SpecId 18
                               Decorate 26 SpecId 19
                2:             TypeVoid
diff --git a/Test/baseResults/spv.130.frag.out b/Test/baseResults/spv.130.frag.out
index 84fa9a3f..8e6c1182 100644
--- a/Test/baseResults/spv.130.frag.out
+++ b/Test/baseResults/spv.130.frag.out
@@ -59,45 +59,45 @@ Validation failed
                               Name 203  "s1D"
                               Name 204  "s2DS"
                               Decorate 17(o) Location 0
-                              Decorate 21(samp2D) DescriptorSet 0
                               Decorate 21(samp2D) Binding 2
-                              Decorate 37(samp2DA) DescriptorSet 0
+                              Decorate 21(samp2D) DescriptorSet 0
                               Decorate 37(samp2DA) Binding 5
-                              Decorate 47(samp2DR) DescriptorSet 0
+                              Decorate 37(samp2DA) DescriptorSet 0
                               Decorate 47(samp2DR) Binding 4
-                              Decorate 55(samp2DS) DescriptorSet 0
+                              Decorate 47(samp2DR) DescriptorSet 0
                               Decorate 55(samp2DS) Binding 3
+                              Decorate 55(samp2DS) DescriptorSet 0
                               Decorate 68(io) Location 1
-                              Decorate 72(Sca) DescriptorSet 0
                               Decorate 72(Sca) Binding 6
+                              Decorate 72(Sca) DescriptorSet 0
                               Decorate 79(i) Location 0
-                              Decorate 87(Isca) DescriptorSet 0
                               Decorate 87(Isca) Binding 7
+                              Decorate 87(Isca) DescriptorSet 0
                               Decorate 99(uo) Location 2
-                              Decorate 103(Usca) DescriptorSet 0
                               Decorate 103(Usca) Binding 8
-                              Decorate 118(Scas) DescriptorSet 0
+                              Decorate 103(Usca) DescriptorSet 0
                               Decorate 118(Scas) Binding 9
-                              Decorate 167(sampC) DescriptorSet 0
+                              Decorate 118(Scas) DescriptorSet 0
                               Decorate 167(sampC) Binding 1
+                              Decorate 167(sampC) DescriptorSet 0
                               Decorate 173(gl_ClipDistance) BuiltIn ClipDistance
                               Decorate 184(fflat) Flat
                               Decorate 184(fflat) Location 1
                               Decorate 185(fsmooth) Location 2
                               Decorate 186(fnop) NoPerspective
                               Decorate 186(fnop) Location 3
-                              Decorate 193(bounds) DescriptorSet 0
                               Decorate 193(bounds) Binding 0
-                              Decorate 194(s2D) DescriptorSet 0
+                              Decorate 193(bounds) DescriptorSet 0
                               Decorate 194(s2D) Binding 0
-                              Decorate 195(s2DR) DescriptorSet 0
+                              Decorate 194(s2D) DescriptorSet 0
                               Decorate 195(s2DR) Binding 0
-                              Decorate 199(s2DRS) DescriptorSet 0
+                              Decorate 195(s2DR) DescriptorSet 0
                               Decorate 199(s2DRS) Binding 0
-                              Decorate 203(s1D) DescriptorSet 0
+                              Decorate 199(s2DRS) DescriptorSet 0
                               Decorate 203(s1D) Binding 0
-                              Decorate 204(s2DS) DescriptorSet 0
+                              Decorate 203(s1D) DescriptorSet 0
                               Decorate 204(s2DS) Binding 0
+                              Decorate 204(s2DS) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
               14:             TypeFloat 32
diff --git a/Test/baseResults/spv.140.frag.out b/Test/baseResults/spv.140.frag.out
index a4401a28..be76ab44 100644
--- a/Test/baseResults/spv.140.frag.out
+++ b/Test/baseResults/spv.140.frag.out
@@ -40,37 +40,37 @@ Validation failed
                               Decorate 23(o) Location 0
                               Decorate 28(gl_ClipDistance) BuiltIn ClipDistance
                               Decorate 38(k) Location 0
-                              Decorate 50(sampR) DescriptorSet 0
                               Decorate 50(sampR) Binding 0
-                              Decorate 58(sampB) DescriptorSet 0
+                              Decorate 50(sampR) DescriptorSet 0
                               Decorate 58(sampB) Binding 1
-                              Decorate 82(samp2Da) DescriptorSet 0
+                              Decorate 58(sampB) DescriptorSet 0
                               Decorate 82(samp2Da) Binding 0
+                              Decorate 82(samp2Da) DescriptorSet 0
                               Decorate 85 ArrayStride 64
                               Decorate 86 ArrayStride 64
-                              MemberDecorate 87(bn) 0 RowMajor
-                              MemberDecorate 87(bn) 0 Offset 0
-                              MemberDecorate 87(bn) 0 MatrixStride 16
-                              MemberDecorate 87(bn) 1 ColMajor
-                              MemberDecorate 87(bn) 1 Offset 256
-                              MemberDecorate 87(bn) 1 MatrixStride 16
-                              MemberDecorate 87(bn) 2 RowMajor
-                              MemberDecorate 87(bn) 2 Offset 512
-                              MemberDecorate 87(bn) 2 MatrixStride 16
-                              MemberDecorate 87(bn) 3 ColMajor
-                              MemberDecorate 87(bn) 3 Offset 576
-                              MemberDecorate 87(bn) 3 MatrixStride 16
-                              MemberDecorate 87(bn) 4 RowMajor
-                              MemberDecorate 87(bn) 4 Offset 1024
-                              MemberDecorate 87(bn) 4 MatrixStride 16
                               Decorate 87(bn) Block
-                              Decorate 89 DescriptorSet 0
+                              MemberDecorate 87(bn) 0 RowMajor
+                              MemberDecorate 87(bn) 0 MatrixStride 16
+                              MemberDecorate 87(bn) 0 Offset 0
+                              MemberDecorate 87(bn) 1 ColMajor
+                              MemberDecorate 87(bn) 1 MatrixStride 16
+                              MemberDecorate 87(bn) 1 Offset 256
+                              MemberDecorate 87(bn) 2 RowMajor
+                              MemberDecorate 87(bn) 2 MatrixStride 16
+                              MemberDecorate 87(bn) 2 Offset 512
+                              MemberDecorate 87(bn) 3 ColMajor
+                              MemberDecorate 87(bn) 3 MatrixStride 16
+                              MemberDecorate 87(bn) 3 Offset 576
+                              MemberDecorate 87(bn) 4 RowMajor
+                              MemberDecorate 87(bn) 4 MatrixStride 16
+                              MemberDecorate 87(bn) 4 Offset 1024
                               Decorate 89 Binding 0
+                              Decorate 89 DescriptorSet 0
                               Decorate 91 ArrayStride 16
-                              MemberDecorate 92(bi) 0 Offset 0
                               Decorate 92(bi) Block
-                              Decorate 95(bname) DescriptorSet 0
+                              MemberDecorate 92(bi) 0 Offset 0
                               Decorate 95(bname) Binding 0
+                              Decorate 95(bname) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out
index b6e22e16..1acde693 100644
--- a/Test/baseResults/spv.150.geom.out
+++ b/Test/baseResults/spv.150.geom.out
@@ -38,27 +38,27 @@ spv.150.geom
                               MemberName 68(toFragment) 0  "color"
                               Name 70  "toF"
                               Decorate 8(fromVertex) Block
-                              Decorate 10 Location 1
                               Decorate 10 Stream 3
+                              Decorate 10 Location 1
                               Decorate 13(fromVertex) Block
                               Decorate 18(fromV) Location 0
+                              Decorate 27(gl_PerVertex) Block
                               MemberDecorate 27(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 27(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 27(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 27(gl_PerVertex) Block
                               Decorate 29 Stream 0
+                              Decorate 30(gl_PerVertex) Block
                               MemberDecorate 30(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 30(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 30(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 30(gl_PerVertex) Block
-                              Decorate 47(gl_PrimitiveID) Stream 0
                               Decorate 47(gl_PrimitiveID) BuiltIn PrimitiveId
+                              Decorate 47(gl_PrimitiveID) Stream 0
                               Decorate 49(gl_PrimitiveIDIn) BuiltIn PrimitiveId
-                              Decorate 51(gl_Layer) Stream 0
                               Decorate 51(gl_Layer) BuiltIn Layer
+                              Decorate 51(gl_Layer) Stream 0
                               Decorate 68(toFragment) Block
-                              Decorate 70(toF) Location 0
                               Decorate 70(toF) Stream 3
+                              Decorate 70(toF) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.150.vert.out b/Test/baseResults/spv.150.vert.out
index 167a15e3..a5513ace 100644
--- a/Test/baseResults/spv.150.vert.out
+++ b/Test/baseResults/spv.150.vert.out
@@ -28,16 +28,16 @@ spv.150.vert
                               Name 40  "i"
                               Name 47  "s2D"
                               Name 62  "ui"
-                              MemberDecorate 11(gl_PerVertex) 0 Invariant
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 11(gl_PerVertex) 0 Invariant
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 11(gl_PerVertex) Block
                               Decorate 17(iv4) Location 0
                               Decorate 23(ps) Location 1
                               Decorate 38(s2out) Location 0
-                              Decorate 47(s2D) DescriptorSet 0
                               Decorate 47(s2D) Binding 0
+                              Decorate 47(s2D) DescriptorSet 0
                               Decorate 62(ui) Location 2
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.16bitstorage-int.frag.out b/Test/baseResults/spv.16bitstorage-int.frag.out
index bced9d30..07db828e 100644
--- a/Test/baseResults/spv.16bitstorage-int.frag.out
+++ b/Test/baseResults/spv.16bitstorage-int.frag.out
@@ -83,6 +83,7 @@ spv.16bitstorage-int.frag
                               Decorate 13 ArrayStride 16
                               Decorate 15 ArrayStride 4
                               Decorate 16 ArrayStride 2
+                              Decorate 17(B2) BufferBlock
                               MemberDecorate 17(B2) 0 Offset 0
                               MemberDecorate 17(B2) 1 Offset 4
                               MemberDecorate 17(B2) 2 Offset 8
@@ -91,14 +92,14 @@ spv.16bitstorage-int.frag
                               MemberDecorate 17(B2) 5 Offset 40
                               MemberDecorate 17(B2) 6 Offset 72
                               MemberDecorate 17(B2) 7 Offset 472
-                              Decorate 17(B2) BufferBlock
-                              Decorate 19(b2) DescriptorSet 0
                               Decorate 19(b2) Binding 1
+                              Decorate 19(b2) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
                               MemberDecorate 23(S) 1 Offset 4
                               MemberDecorate 23(S) 2 Offset 8
                               Decorate 24 ArrayStride 16
+                              Decorate 25(B1) Block
                               MemberDecorate 25(B1) 0 Offset 0
                               MemberDecorate 25(B1) 1 Offset 4
                               MemberDecorate 25(B1) 2 Offset 8
@@ -106,9 +107,8 @@ spv.16bitstorage-int.frag
                               MemberDecorate 25(B1) 4 Offset 48
                               MemberDecorate 25(B1) 5 Offset 64
                               MemberDecorate 25(B1) 6 Offset 96
-                              Decorate 25(B1) Block
-                              Decorate 27(b1) DescriptorSet 0
                               Decorate 27(b1) Binding 0
+                              Decorate 27(b1) DescriptorSet 0
                               Decorate 44 ArrayStride 16
                               MemberDecorate 45(S) 0 Offset 0
                               MemberDecorate 45(S) 1 Offset 4
@@ -116,6 +116,7 @@ spv.16bitstorage-int.frag
                               Decorate 46 ArrayStride 16
                               Decorate 47 ArrayStride 16
                               Decorate 48 ArrayStride 16
+                              Decorate 49(B5) Block
                               MemberDecorate 49(B5) 0 Offset 0
                               MemberDecorate 49(B5) 1 Offset 4
                               MemberDecorate 49(B5) 2 Offset 8
@@ -124,29 +125,28 @@ spv.16bitstorage-int.frag
                               MemberDecorate 49(B5) 5 Offset 64
                               MemberDecorate 49(B5) 6 Offset 96
                               MemberDecorate 49(B5) 7 Offset 1696
-                              Decorate 49(B5) Block
-                              Decorate 51(b5) DescriptorSet 0
                               Decorate 51(b5) Binding 2
+                              Decorate 51(b5) DescriptorSet 0
                               MemberDecorate 88(S2) 0 ColMajor
-                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 1 Offset 64
                               MemberDecorate 88(S2) 2 Offset 68
                               MemberDecorate 89(S3) 0 Offset 0
+                              Decorate 90(B4) BufferBlock
                               MemberDecorate 90(B4) 0 Offset 0
                               MemberDecorate 90(B4) 1 Offset 80
-                              Decorate 90(B4) BufferBlock
-                              Decorate 92(b4) DescriptorSet 0
                               Decorate 92(b4) Binding 4
+                              Decorate 92(b4) DescriptorSet 0
                               MemberDecorate 93(S2) 0 RowMajor
-                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 1 Offset 64
                               MemberDecorate 93(S2) 2 Offset 68
-                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 94(B3) BufferBlock
-                              Decorate 96(b3) DescriptorSet 0
+                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 96(b3) Binding 3
+                              Decorate 96(b3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 16 1
diff --git a/Test/baseResults/spv.16bitstorage-uint.frag.out b/Test/baseResults/spv.16bitstorage-uint.frag.out
index adf5237b..8b169f3a 100644
--- a/Test/baseResults/spv.16bitstorage-uint.frag.out
+++ b/Test/baseResults/spv.16bitstorage-uint.frag.out
@@ -83,6 +83,7 @@ spv.16bitstorage-uint.frag
                               Decorate 13 ArrayStride 16
                               Decorate 15 ArrayStride 4
                               Decorate 16 ArrayStride 2
+                              Decorate 17(B2) BufferBlock
                               MemberDecorate 17(B2) 0 Offset 0
                               MemberDecorate 17(B2) 1 Offset 4
                               MemberDecorate 17(B2) 2 Offset 8
@@ -91,14 +92,14 @@ spv.16bitstorage-uint.frag
                               MemberDecorate 17(B2) 5 Offset 40
                               MemberDecorate 17(B2) 6 Offset 72
                               MemberDecorate 17(B2) 7 Offset 472
-                              Decorate 17(B2) BufferBlock
-                              Decorate 19(b2) DescriptorSet 0
                               Decorate 19(b2) Binding 1
+                              Decorate 19(b2) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
                               MemberDecorate 23(S) 1 Offset 4
                               MemberDecorate 23(S) 2 Offset 8
                               Decorate 24 ArrayStride 16
+                              Decorate 25(B1) Block
                               MemberDecorate 25(B1) 0 Offset 0
                               MemberDecorate 25(B1) 1 Offset 4
                               MemberDecorate 25(B1) 2 Offset 8
@@ -106,9 +107,8 @@ spv.16bitstorage-uint.frag
                               MemberDecorate 25(B1) 4 Offset 48
                               MemberDecorate 25(B1) 5 Offset 64
                               MemberDecorate 25(B1) 6 Offset 96
-                              Decorate 25(B1) Block
-                              Decorate 27(b1) DescriptorSet 0
                               Decorate 27(b1) Binding 0
+                              Decorate 27(b1) DescriptorSet 0
                               Decorate 44 ArrayStride 16
                               MemberDecorate 45(S) 0 Offset 0
                               MemberDecorate 45(S) 1 Offset 4
@@ -116,6 +116,7 @@ spv.16bitstorage-uint.frag
                               Decorate 46 ArrayStride 16
                               Decorate 47 ArrayStride 16
                               Decorate 48 ArrayStride 16
+                              Decorate 49(B5) Block
                               MemberDecorate 49(B5) 0 Offset 0
                               MemberDecorate 49(B5) 1 Offset 4
                               MemberDecorate 49(B5) 2 Offset 8
@@ -124,29 +125,28 @@ spv.16bitstorage-uint.frag
                               MemberDecorate 49(B5) 5 Offset 64
                               MemberDecorate 49(B5) 6 Offset 96
                               MemberDecorate 49(B5) 7 Offset 1696
-                              Decorate 49(B5) Block
-                              Decorate 51(b5) DescriptorSet 0
                               Decorate 51(b5) Binding 2
+                              Decorate 51(b5) DescriptorSet 0
                               MemberDecorate 89(S2) 0 ColMajor
-                              MemberDecorate 89(S2) 0 Offset 0
                               MemberDecorate 89(S2) 0 MatrixStride 16
+                              MemberDecorate 89(S2) 0 Offset 0
                               MemberDecorate 89(S2) 1 Offset 64
                               MemberDecorate 89(S2) 2 Offset 68
                               MemberDecorate 90(S3) 0 Offset 0
+                              Decorate 91(B4) BufferBlock
                               MemberDecorate 91(B4) 0 Offset 0
                               MemberDecorate 91(B4) 1 Offset 80
-                              Decorate 91(B4) BufferBlock
-                              Decorate 93(b4) DescriptorSet 0
                               Decorate 93(b4) Binding 4
+                              Decorate 93(b4) DescriptorSet 0
                               MemberDecorate 94(S2) 0 RowMajor
-                              MemberDecorate 94(S2) 0 Offset 0
                               MemberDecorate 94(S2) 0 MatrixStride 16
+                              MemberDecorate 94(S2) 0 Offset 0
                               MemberDecorate 94(S2) 1 Offset 64
                               MemberDecorate 94(S2) 2 Offset 68
-                              MemberDecorate 95(B3) 0 Offset 0
                               Decorate 95(B3) BufferBlock
-                              Decorate 97(b3) DescriptorSet 0
+                              MemberDecorate 95(B3) 0 Offset 0
                               Decorate 97(b3) Binding 3
+                              Decorate 97(b3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 16 0
diff --git a/Test/baseResults/spv.16bitstorage.frag.out b/Test/baseResults/spv.16bitstorage.frag.out
index bb1b1642..f62f17ac 100644
--- a/Test/baseResults/spv.16bitstorage.frag.out
+++ b/Test/baseResults/spv.16bitstorage.frag.out
@@ -83,6 +83,7 @@ spv.16bitstorage.frag
                               Decorate 13 ArrayStride 16
                               Decorate 15 ArrayStride 4
                               Decorate 16 ArrayStride 2
+                              Decorate 17(B2) BufferBlock
                               MemberDecorate 17(B2) 0 Offset 0
                               MemberDecorate 17(B2) 1 Offset 4
                               MemberDecorate 17(B2) 2 Offset 8
@@ -91,14 +92,14 @@ spv.16bitstorage.frag
                               MemberDecorate 17(B2) 5 Offset 40
                               MemberDecorate 17(B2) 6 Offset 72
                               MemberDecorate 17(B2) 7 Offset 472
-                              Decorate 17(B2) BufferBlock
-                              Decorate 19(b2) DescriptorSet 0
                               Decorate 19(b2) Binding 1
+                              Decorate 19(b2) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
                               MemberDecorate 23(S) 1 Offset 4
                               MemberDecorate 23(S) 2 Offset 8
                               Decorate 24 ArrayStride 16
+                              Decorate 25(B1) Block
                               MemberDecorate 25(B1) 0 Offset 0
                               MemberDecorate 25(B1) 1 Offset 4
                               MemberDecorate 25(B1) 2 Offset 8
@@ -106,9 +107,8 @@ spv.16bitstorage.frag
                               MemberDecorate 25(B1) 4 Offset 48
                               MemberDecorate 25(B1) 5 Offset 64
                               MemberDecorate 25(B1) 6 Offset 96
-                              Decorate 25(B1) Block
-                              Decorate 27(b1) DescriptorSet 0
                               Decorate 27(b1) Binding 0
+                              Decorate 27(b1) DescriptorSet 0
                               Decorate 45 ArrayStride 16
                               MemberDecorate 46(S) 0 Offset 0
                               MemberDecorate 46(S) 1 Offset 4
@@ -116,6 +116,7 @@ spv.16bitstorage.frag
                               Decorate 47 ArrayStride 16
                               Decorate 48 ArrayStride 16
                               Decorate 49 ArrayStride 16
+                              Decorate 50(B5) Block
                               MemberDecorate 50(B5) 0 Offset 0
                               MemberDecorate 50(B5) 1 Offset 4
                               MemberDecorate 50(B5) 2 Offset 8
@@ -124,29 +125,28 @@ spv.16bitstorage.frag
                               MemberDecorate 50(B5) 5 Offset 64
                               MemberDecorate 50(B5) 6 Offset 96
                               MemberDecorate 50(B5) 7 Offset 1696
-                              Decorate 50(B5) Block
-                              Decorate 52(b5) DescriptorSet 0
                               Decorate 52(b5) Binding 2
+                              Decorate 52(b5) DescriptorSet 0
                               MemberDecorate 88(S2) 0 ColMajor
-                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 1 Offset 64
                               MemberDecorate 88(S2) 2 Offset 68
                               MemberDecorate 89(S3) 0 Offset 0
+                              Decorate 90(B4) BufferBlock
                               MemberDecorate 90(B4) 0 Offset 0
                               MemberDecorate 90(B4) 1 Offset 80
-                              Decorate 90(B4) BufferBlock
-                              Decorate 92(b4) DescriptorSet 0
                               Decorate 92(b4) Binding 4
+                              Decorate 92(b4) DescriptorSet 0
                               MemberDecorate 93(S2) 0 RowMajor
-                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 1 Offset 64
                               MemberDecorate 93(S2) 2 Offset 68
-                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 94(B3) BufferBlock
-                              Decorate 96(b3) DescriptorSet 0
+                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 96(b3) Binding 3
+                              Decorate 96(b3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 16
diff --git a/Test/baseResults/spv.16bitxfb.vert.out b/Test/baseResults/spv.16bitxfb.vert.out
index 2dd93d4b..4fe2bf73 100644
--- a/Test/baseResults/spv.16bitxfb.vert.out
+++ b/Test/baseResults/spv.16bitxfb.vert.out
@@ -31,24 +31,24 @@ spv.16bitxfb.vert
                               Name 46  ""
                               Name 49  "iu16v4"
                               Decorate 9(of16v3) Location 0
+                              Decorate 9(of16v3) Offset 0
                               Decorate 9(of16v3) XfbBuffer 0
                               Decorate 9(of16v3) XfbStride 6
-                              Decorate 9(of16v3) Offset 0
                               Decorate 12(if16v4) Location 0
+                              Decorate 16(F16Out) Block
                               MemberDecorate 16(F16Out) 0 Offset 0
                               MemberDecorate 16(F16Out) 1 Offset 2
-                              Decorate 16(F16Out) Block
                               Decorate 18 Location 1
                               Decorate 18 XfbBuffer 1
                               Decorate 18 XfbStride 6
                               Decorate 36(oi16v3) Location 5
+                              Decorate 36(oi16v3) Offset 0
                               Decorate 36(oi16v3) XfbBuffer 2
                               Decorate 36(oi16v3) XfbStride 6
-                              Decorate 36(oi16v3) Offset 0
                               Decorate 39(ii16v4) Location 1
+                              Decorate 44(I16Out) Block
                               MemberDecorate 44(I16Out) 0 Offset 0
                               MemberDecorate 44(I16Out) 1 Offset 2
-                              Decorate 44(I16Out) Block
                               Decorate 46 Location 6
                               Decorate 46 XfbBuffer 3
                               Decorate 46 XfbStride 6
diff --git a/Test/baseResults/spv.300BuiltIns.vert.out b/Test/baseResults/spv.300BuiltIns.vert.out
index 10f115be..b2607d33 100644
--- a/Test/baseResults/spv.300BuiltIns.vert.out
+++ b/Test/baseResults/spv.300BuiltIns.vert.out
@@ -16,10 +16,10 @@ spv.300BuiltIns.vert
                               Name 14  "ps"
                               Name 21  "gl_VertexIndex"
                               Name 34  "gl_InstanceIndex"
-                              MemberDecorate 8(gl_PerVertex) 0 Invariant
-                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 8(gl_PerVertex) 1 BuiltIn PointSize
                               Decorate 8(gl_PerVertex) Block
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 8(gl_PerVertex) 0 Invariant
+                              MemberDecorate 8(gl_PerVertex) 1 BuiltIn PointSize
                               Decorate 14(ps) RelaxedPrecision
                               Decorate 14(ps) Location 0
                               Decorate 15 RelaxedPrecision
diff --git a/Test/baseResults/spv.300layout.vert.out b/Test/baseResults/spv.300layout.vert.out
index 6345aa12..7806b588 100644
--- a/Test/baseResults/spv.300layout.vert.out
+++ b/Test/baseResults/spv.300layout.vert.out
@@ -38,40 +38,40 @@ spv.300layout.vert
                               Name 128  "s"
                               Decorate 9(pos) Location 0
                               Decorate 11(p) Location 3
-                              MemberDecorate 17(Transform) 0 RowMajor
-                              MemberDecorate 17(Transform) 0 Offset 0
-                              MemberDecorate 17(Transform) 0 MatrixStride 16
-                              MemberDecorate 17(Transform) 1 ColMajor
-                              MemberDecorate 17(Transform) 1 Offset 64
-                              MemberDecorate 17(Transform) 1 MatrixStride 16
-                              MemberDecorate 17(Transform) 2 RowMajor
-                              MemberDecorate 17(Transform) 2 Offset 128
-                              MemberDecorate 17(Transform) 2 MatrixStride 16
-                              MemberDecorate 17(Transform) 3 Offset 176
                               Decorate 17(Transform) Block
-                              Decorate 19(tblock) DescriptorSet 0
+                              MemberDecorate 17(Transform) 0 RowMajor
+                              MemberDecorate 17(Transform) 0 MatrixStride 16
+                              MemberDecorate 17(Transform) 0 Offset 0
+                              MemberDecorate 17(Transform) 1 ColMajor
+                              MemberDecorate 17(Transform) 1 MatrixStride 16
+                              MemberDecorate 17(Transform) 1 Offset 64
+                              MemberDecorate 17(Transform) 2 RowMajor
+                              MemberDecorate 17(Transform) 2 MatrixStride 16
+                              MemberDecorate 17(Transform) 2 Offset 128
+                              MemberDecorate 17(Transform) 3 Offset 176
                               Decorate 19(tblock) Binding 0
+                              Decorate 19(tblock) DescriptorSet 0
                               Decorate 44 ArrayStride 16
-                              MemberDecorate 45(T3) 0 ColMajor
-                              MemberDecorate 45(T3) 0 Offset 0
-                              MemberDecorate 45(T3) 0 MatrixStride 16
-                              MemberDecorate 45(T3) 1 RowMajor
-                              MemberDecorate 45(T3) 1 Offset 64
-                              MemberDecorate 45(T3) 1 MatrixStride 16
-                              MemberDecorate 45(T3) 2 ColMajor
-                              MemberDecorate 45(T3) 2 Offset 128
-                              MemberDecorate 45(T3) 2 MatrixStride 16
-                              MemberDecorate 45(T3) 3 Offset 2048
                               Decorate 45(T3) Block
-                              Decorate 47 DescriptorSet 0
+                              MemberDecorate 45(T3) 0 ColMajor
+                              MemberDecorate 45(T3) 0 MatrixStride 16
+                              MemberDecorate 45(T3) 0 Offset 0
+                              MemberDecorate 45(T3) 1 RowMajor
+                              MemberDecorate 45(T3) 1 MatrixStride 16
+                              MemberDecorate 45(T3) 1 Offset 64
+                              MemberDecorate 45(T3) 2 ColMajor
+                              MemberDecorate 45(T3) 2 MatrixStride 16
+                              MemberDecorate 45(T3) 2 Offset 128
+                              MemberDecorate 45(T3) 3 Offset 2048
                               Decorate 47 Binding 2
+                              Decorate 47 DescriptorSet 0
+                              Decorate 78(T2) Block
                               MemberDecorate 78(T2) 0 Offset 0
                               MemberDecorate 78(T2) 1 RowMajor
-                              MemberDecorate 78(T2) 1 Offset 16
                               MemberDecorate 78(T2) 1 MatrixStride 16
-                              Decorate 78(T2) Block
-                              Decorate 80 DescriptorSet 0
+                              MemberDecorate 78(T2) 1 Offset 16
                               Decorate 80 Binding 1
+                              Decorate 80 DescriptorSet 0
                               Decorate 98(color) Location 1
                               Decorate 100(c) Location 7
                               Decorate 108(iout) Flat
diff --git a/Test/baseResults/spv.300layoutp.vert.out b/Test/baseResults/spv.300layoutp.vert.out
index d986fb54..cec34743 100644
--- a/Test/baseResults/spv.300layoutp.vert.out
+++ b/Test/baseResults/spv.300layoutp.vert.out
@@ -38,40 +38,40 @@ spv.300layoutp.vert
                               Name 80  "s"
                               Decorate 9(pos) Location 0
                               Decorate 11(p) Location 3
-                              MemberDecorate 17(Transform) 0 RowMajor
-                              MemberDecorate 17(Transform) 0 Offset 0
-                              MemberDecorate 17(Transform) 0 MatrixStride 16
-                              MemberDecorate 17(Transform) 1 ColMajor
-                              MemberDecorate 17(Transform) 1 Offset 64
-                              MemberDecorate 17(Transform) 1 MatrixStride 16
-                              MemberDecorate 17(Transform) 2 RowMajor
-                              MemberDecorate 17(Transform) 2 Offset 128
-                              MemberDecorate 17(Transform) 2 MatrixStride 16
-                              MemberDecorate 17(Transform) 3 Offset 176
                               Decorate 17(Transform) Block
-                              Decorate 19(tblock) DescriptorSet 0
+                              MemberDecorate 17(Transform) 0 RowMajor
+                              MemberDecorate 17(Transform) 0 MatrixStride 16
+                              MemberDecorate 17(Transform) 0 Offset 0
+                              MemberDecorate 17(Transform) 1 ColMajor
+                              MemberDecorate 17(Transform) 1 MatrixStride 16
+                              MemberDecorate 17(Transform) 1 Offset 64
+                              MemberDecorate 17(Transform) 2 RowMajor
+                              MemberDecorate 17(Transform) 2 MatrixStride 16
+                              MemberDecorate 17(Transform) 2 Offset 128
+                              MemberDecorate 17(Transform) 3 Offset 176
                               Decorate 19(tblock) Binding 0
+                              Decorate 19(tblock) DescriptorSet 0
                               Decorate 32 ArrayStride 16
-                              MemberDecorate 33(T3) 0 ColMajor
-                              MemberDecorate 33(T3) 0 Offset 0
-                              MemberDecorate 33(T3) 0 MatrixStride 16
-                              MemberDecorate 33(T3) 1 RowMajor
-                              MemberDecorate 33(T3) 1 Offset 64
-                              MemberDecorate 33(T3) 1 MatrixStride 16
-                              MemberDecorate 33(T3) 2 ColMajor
-                              MemberDecorate 33(T3) 2 Offset 128
-                              MemberDecorate 33(T3) 2 MatrixStride 16
-                              MemberDecorate 33(T3) 3 Offset 160
                               Decorate 33(T3) Block
-                              Decorate 35 DescriptorSet 0
+                              MemberDecorate 33(T3) 0 ColMajor
+                              MemberDecorate 33(T3) 0 MatrixStride 16
+                              MemberDecorate 33(T3) 0 Offset 0
+                              MemberDecorate 33(T3) 1 RowMajor
+                              MemberDecorate 33(T3) 1 MatrixStride 16
+                              MemberDecorate 33(T3) 1 Offset 64
+                              MemberDecorate 33(T3) 2 ColMajor
+                              MemberDecorate 33(T3) 2 MatrixStride 16
+                              MemberDecorate 33(T3) 2 Offset 128
+                              MemberDecorate 33(T3) 3 Offset 160
                               Decorate 35 Binding 2
+                              Decorate 35 DescriptorSet 0
+                              Decorate 42(T2) Block
                               MemberDecorate 42(T2) 0 Offset 0
                               MemberDecorate 42(T2) 1 RowMajor
-                              MemberDecorate 42(T2) 1 Offset 16
                               MemberDecorate 42(T2) 1 MatrixStride 16
-                              Decorate 42(T2) Block
-                              Decorate 44 DescriptorSet 0
+                              MemberDecorate 42(T2) 1 Offset 16
                               Decorate 44 Binding 1
+                              Decorate 44 DescriptorSet 0
                               Decorate 50(color) Location 1
                               Decorate 52(c) Location 7
                               Decorate 60(iout) Flat
diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out
index 459c689b..1b585c7b 100644
--- a/Test/baseResults/spv.310.comp.out
+++ b/Test/baseResults/spv.310.comp.out
@@ -32,24 +32,24 @@ spv.310.comp
                               Name 53  "gl_LocalInvocationID"
                               Name 65  "gl_DeviceIndex"
                               Decorate 11 ArrayStride 16
+                              Decorate 12(outb) BufferBlock
                               MemberDecorate 12(outb) 0 Offset 0
                               MemberDecorate 12(outb) 1 Offset 4
                               MemberDecorate 12(outb) 2 Offset 8
                               MemberDecorate 12(outb) 3 Offset 16
-                              Decorate 12(outb) BufferBlock
-                              Decorate 14(outbname) DescriptorSet 0
                               Decorate 14(outbname) Binding 0
+                              Decorate 14(outbname) DescriptorSet 0
+                              Decorate 23(outbna) BufferBlock
                               MemberDecorate 23(outbna) 0 Offset 0
                               MemberDecorate 23(outbna) 1 Offset 16
-                              Decorate 23(outbna) BufferBlock
-                              Decorate 25(outbnamena) DescriptorSet 0
                               Decorate 25(outbnamena) Binding 1
+                              Decorate 25(outbnamena) DescriptorSet 0
                               Decorate 47 ArrayStride 16
+                              Decorate 48(outs) BufferBlock
                               MemberDecorate 48(outs) 0 Offset 0
                               MemberDecorate 48(outs) 1 Offset 16
-                              Decorate 48(outs) BufferBlock
-                              Decorate 50(outnames) DescriptorSet 0
                               Decorate 50(outnames) Binding 2
+                              Decorate 50(outnames) DescriptorSet 0
                               Decorate 53(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 65(gl_DeviceIndex) BuiltIn DeviceIndex
                               Decorate 71 BuiltIn WorkgroupSize
diff --git a/Test/baseResults/spv.320.meshShaderUserDefined.mesh.out b/Test/baseResults/spv.320.meshShaderUserDefined.mesh.out
index 197fe602..5d82e66d 100644
--- a/Test/baseResults/spv.320.meshShaderUserDefined.mesh.out
+++ b/Test/baseResults/spv.320.meshShaderUserDefined.mesh.out
@@ -34,13 +34,13 @@ spv.320.meshShaderUserDefined.mesh
                               Name 106  "blk2"
                               Decorate 12(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 19(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 33(myblock) Block
                               MemberDecorate 33(myblock) 0 PerPrimitiveNV
                               MemberDecorate 33(myblock) 1 PerPrimitiveNV
                               MemberDecorate 33(myblock) 2 PerPrimitiveNV
                               MemberDecorate 33(myblock) 3 PerPrimitiveNV
                               MemberDecorate 33(myblock) 4 PerPrimitiveNV
                               MemberDecorate 33(myblock) 5 PerPrimitiveNV
-                              Decorate 33(myblock) Block
                               Decorate 37(blk) Location 0
                               Decorate 102(myblock2) Block
                               Decorate 106(blk2) Location 20
diff --git a/Test/baseResults/spv.330.geom.out b/Test/baseResults/spv.330.geom.out
index f9e69e57..a6923466 100644
--- a/Test/baseResults/spv.330.geom.out
+++ b/Test/baseResults/spv.330.geom.out
@@ -23,12 +23,12 @@ spv.330.geom
                               MemberName 16(gl_PerVertex) 0  "gl_Position"
                               MemberName 16(gl_PerVertex) 1  "gl_ClipDistance"
                               Name 20  "gl_in"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn ClipDistance
-                              Decorate 11(gl_PerVertex) Block
+                              Decorate 16(gl_PerVertex) Block
                               MemberDecorate 16(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 16(gl_PerVertex) 1 BuiltIn ClipDistance
-                              Decorate 16(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.400.frag.nanclamp.out b/Test/baseResults/spv.400.frag.nanclamp.out
index f03e9386..c913e41c 100644
--- a/Test/baseResults/spv.400.frag.nanclamp.out
+++ b/Test/baseResults/spv.400.frag.nanclamp.out
@@ -53,27 +53,27 @@ spv.400.frag
                               Name 1119  "id"
                               Name 1120  "gl_PrimitiveID"
                               Decorate 13(outp) Location 1
-                              Decorate 17(u2drs) DescriptorSet 0
                               Decorate 17(u2drs) Binding 3
-                              Decorate 1025(arrayedSampler) DescriptorSet 0
+                              Decorate 17(u2drs) DescriptorSet 0
                               Decorate 1025(arrayedSampler) Binding 0
+                              Decorate 1025(arrayedSampler) DescriptorSet 0
                               Decorate 1027(i) Flat
                               Decorate 1027(i) Location 1
                               Decorate 1033(c2D) Location 0
                               Decorate 1038(gl_ClipDistance) BuiltIn ClipDistance
                               Decorate 1054(uoutp) Location 3
-                              Decorate 1058(samp2dr) DescriptorSet 0
                               Decorate 1058(samp2dr) Binding 1
+                              Decorate 1058(samp2dr) DescriptorSet 0
                               Decorate 1080(ioutp) Location 2
-                              Decorate 1084(isamp2DA) DescriptorSet 0
                               Decorate 1084(isamp2DA) Binding 2
+                              Decorate 1084(isamp2DA) DescriptorSet 0
                               Decorate 1101(gl_FragCoord) BuiltIn FragCoord
                               Decorate 1103(vl2) Location 6
                               Decorate 1109(uo) Location 0
                               Decorate 1111(u) Flat
                               Decorate 1111(u) Location 2
-                              Decorate 1120(gl_PrimitiveID) Flat
                               Decorate 1120(gl_PrimitiveID) BuiltIn PrimitiveId
+                              Decorate 1120(gl_PrimitiveID) Flat
                2:             TypeVoid
                3:             TypeFunction 2
               10:             TypeFloat 32
diff --git a/Test/baseResults/spv.400.frag.out b/Test/baseResults/spv.400.frag.out
index aa42d282..b010d7da 100644
--- a/Test/baseResults/spv.400.frag.out
+++ b/Test/baseResults/spv.400.frag.out
@@ -54,27 +54,27 @@ Validation failed
                               Name 1119  "id"
                               Name 1120  "gl_PrimitiveID"
                               Decorate 13(outp) Location 1
-                              Decorate 17(u2drs) DescriptorSet 0
                               Decorate 17(u2drs) Binding 3
-                              Decorate 1025(arrayedSampler) DescriptorSet 0
+                              Decorate 17(u2drs) DescriptorSet 0
                               Decorate 1025(arrayedSampler) Binding 0
+                              Decorate 1025(arrayedSampler) DescriptorSet 0
                               Decorate 1027(i) Flat
                               Decorate 1027(i) Location 1
                               Decorate 1033(c2D) Location 0
                               Decorate 1038(gl_ClipDistance) BuiltIn ClipDistance
                               Decorate 1054(uoutp) Location 3
-                              Decorate 1058(samp2dr) DescriptorSet 0
                               Decorate 1058(samp2dr) Binding 1
+                              Decorate 1058(samp2dr) DescriptorSet 0
                               Decorate 1080(ioutp) Location 2
-                              Decorate 1084(isamp2DA) DescriptorSet 0
                               Decorate 1084(isamp2DA) Binding 2
+                              Decorate 1084(isamp2DA) DescriptorSet 0
                               Decorate 1101(gl_FragCoord) BuiltIn FragCoord
                               Decorate 1103(vl2) Location 6
                               Decorate 1109(uo) Location 0
                               Decorate 1111(u) Flat
                               Decorate 1111(u) Location 2
-                              Decorate 1120(gl_PrimitiveID) Flat
                               Decorate 1120(gl_PrimitiveID) BuiltIn PrimitiveId
+                              Decorate 1120(gl_PrimitiveID) Flat
                2:             TypeVoid
                3:             TypeFunction 2
               10:             TypeFloat 32
diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out
index b6f0ddfd..79369339 100644
--- a/Test/baseResults/spv.400.tesc.out
+++ b/Test/baseResults/spv.400.tesc.out
@@ -43,21 +43,21 @@ spv.400.tesc
                               Name 87  "ivlb"
                               Name 90  "ovla"
                               Name 91  "ovlb"
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 20(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 41(gl_PatchVerticesIn) BuiltIn PatchVertices
                               Decorate 44(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 47(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 50(gl_PerVertex) Block
                               MemberDecorate 50(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 50(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 50(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 50(gl_PerVertex) Block
-                              Decorate 67(gl_TessLevelOuter) Patch
                               Decorate 67(gl_TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 72(gl_TessLevelInner) Patch
+                              Decorate 67(gl_TessLevelOuter) Patch
                               Decorate 72(gl_TessLevelInner) BuiltIn TessLevelInner
+                              Decorate 72(gl_TessLevelInner) Patch
                               Decorate 78(patchOut) Patch
                               Decorate 78(patchOut) Location 0
                               Decorate 82(inb) Location 0
diff --git a/Test/baseResults/spv.400.tese.out b/Test/baseResults/spv.400.tese.out
index 0b8abf66..0bcfc118 100644
--- a/Test/baseResults/spv.400.tese.out
+++ b/Test/baseResults/spv.400.tese.out
@@ -52,21 +52,21 @@ spv.400.tese
                               Name 91  "ivla"
                               Name 92  "ivlb"
                               Name 95  "ovla"
+                              Decorate 17(gl_PerVertex) Block
                               MemberDecorate 17(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 17(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 17(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 17(gl_PerVertex) Block
                               Decorate 38(gl_PatchVerticesIn) BuiltIn PatchVertices
                               Decorate 41(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 47(gl_TessCoord) BuiltIn TessCoord
-                              Decorate 53(gl_TessLevelOuter) Patch
                               Decorate 53(gl_TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 61(gl_TessLevelInner) Patch
+                              Decorate 53(gl_TessLevelOuter) Patch
                               Decorate 61(gl_TessLevelInner) BuiltIn TessLevelInner
+                              Decorate 61(gl_TessLevelInner) Patch
+                              Decorate 64(gl_PerVertex) Block
                               MemberDecorate 64(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 64(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 64(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 64(gl_PerVertex) Block
                               Decorate 75(patchIn) Patch
                               Decorate 75(patchIn) Location 0
                               Decorate 79(inb) Location 1
diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out
index d814d1ae..8cd44205 100644
--- a/Test/baseResults/spv.420.geom.out
+++ b/Test/baseResults/spv.420.geom.out
@@ -32,16 +32,16 @@ spv.420.geom
                               Name 46  "coord"
                               Name 64  "i"
                               Name 67  "indexable"
-                              MemberDecorate 9(gl_PerVertex) 0 BuiltIn PointSize
                               Decorate 9(gl_PerVertex) Block
-                              MemberDecorate 21(gl_PerVertex) 0 BuiltIn PointSize
+                              MemberDecorate 9(gl_PerVertex) 0 BuiltIn PointSize
                               Decorate 21(gl_PerVertex) Block
+                              MemberDecorate 21(gl_PerVertex) 0 BuiltIn PointSize
                               Decorate 23 Stream 0
-                              Decorate 28(gl_ViewportIndex) Stream 0
                               Decorate 28(gl_ViewportIndex) BuiltIn ViewportIndex
+                              Decorate 28(gl_ViewportIndex) Stream 0
                               Decorate 33(gl_InvocationID) BuiltIn InvocationId
-                              Decorate 41(s2D) DescriptorSet 0
                               Decorate 41(s2D) Binding 0
+                              Decorate 41(s2D) DescriptorSet 0
                               Decorate 46(coord) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.430.frag.out b/Test/baseResults/spv.430.frag.out
index bc00fa13..009f0638 100644
--- a/Test/baseResults/spv.430.frag.out
+++ b/Test/baseResults/spv.430.frag.out
@@ -16,10 +16,10 @@ spv.430.frag
                               Name 14  "gl_Layer"
                               Name 19  "gl_ViewportIndex"
                               Decorate 9(color) Location 0
-                              Decorate 14(gl_Layer) Flat
                               Decorate 14(gl_Layer) BuiltIn Layer
-                              Decorate 19(gl_ViewportIndex) Flat
+                              Decorate 14(gl_Layer) Flat
                               Decorate 19(gl_ViewportIndex) BuiltIn ViewportIndex
+                              Decorate 19(gl_ViewportIndex) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out
index eada8d05..8a75ae0a 100644
--- a/Test/baseResults/spv.430.vert.out
+++ b/Test/baseResults/spv.430.vert.out
@@ -40,34 +40,34 @@ Validation failed
                               Name 63  "MS"
                               MemberName 63(MS) 0  "f"
                               Name 65  "outMS"
-                              MemberDecorate 10(gl_PerVertex) 0 BuiltIn ClipDistance
                               Decorate 10(gl_PerVertex) Block
+                              MemberDecorate 10(gl_PerVertex) 0 BuiltIn ClipDistance
                               Decorate 23(bad) Location 0
                               Decorate 34(badorder3) Flat
                               Decorate 34(badorder3) Location 1
                               Decorate 38(f) Location 11
                               Decorate 41(badorder) Location 10
-                              Decorate 42(badorder2) Location 0
                               Decorate 42(badorder2) Invariant
-                              MemberDecorate 43(boundblock) 0 Offset 0
+                              Decorate 42(badorder2) Location 0
                               Decorate 43(boundblock) Block
-                              Decorate 45(boundInst) DescriptorSet 0
+                              MemberDecorate 43(boundblock) 0 Offset 0
                               Decorate 45(boundInst) Binding 3
-                              MemberDecorate 46(anonblock) 0 Offset 0
+                              Decorate 45(boundInst) DescriptorSet 0
                               Decorate 46(anonblock) Block
-                              Decorate 48 DescriptorSet 0
+                              MemberDecorate 46(anonblock) 0 Offset 0
                               Decorate 48 Binding 7
-                              Decorate 52(sampb1) DescriptorSet 0
+                              Decorate 48 DescriptorSet 0
                               Decorate 52(sampb1) Binding 4
-                              Decorate 55(sampb2) DescriptorSet 0
+                              Decorate 52(sampb1) DescriptorSet 0
                               Decorate 55(sampb2) Binding 5
-                              Decorate 56(sampb4) DescriptorSet 0
+                              Decorate 55(sampb2) DescriptorSet 0
                               Decorate 56(sampb4) Binding 31
+                              Decorate 56(sampb4) DescriptorSet 0
                               MemberDecorate 59(S) 0 RelaxedPrecision
                               Decorate 62(var) Flat
                               Decorate 62(var) Location 0
-                              MemberDecorate 63(MS) 0 Location 17
                               Decorate 63(MS) Block
+                              MemberDecorate 63(MS) 0 Location 17
                               Decorate 65(outMS) Location 2
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.450.geom.out b/Test/baseResults/spv.450.geom.out
index 5398b3c0..f2f9a065 100644
--- a/Test/baseResults/spv.450.geom.out
+++ b/Test/baseResults/spv.450.geom.out
@@ -29,16 +29,16 @@ spv.450.geom
                               Name 20  "gl_in"
                               Name 27  "gl_Layer"
                               Name 29  "gl_ViewportIndex"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
+                              Decorate 16(gl_PerVertex) Block
                               MemberDecorate 16(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 16(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 16(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 16(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 16(gl_PerVertex) Block
                               Decorate 27(gl_Layer) BuiltIn Layer
                               Decorate 29(gl_ViewportIndex) BuiltIn ViewportIndex
                2:             TypeVoid
diff --git a/Test/baseResults/spv.450.noRedecl.tesc.out b/Test/baseResults/spv.450.noRedecl.tesc.out
index dcf0a9f9..fb31be5f 100644
--- a/Test/baseResults/spv.450.noRedecl.tesc.out
+++ b/Test/baseResults/spv.450.noRedecl.tesc.out
@@ -18,11 +18,11 @@ spv.450.noRedecl.tesc
                               MemberName 11(gl_PerVertex) 3  "gl_CullDistance"
                               Name 15  "gl_in"
                               Name 20  "patchOut"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
                               Decorate 20(patchOut) Patch
                               Decorate 20(patchOut) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.450.tesc.out b/Test/baseResults/spv.450.tesc.out
index eabb9e7c..bb5d55bd 100644
--- a/Test/baseResults/spv.450.tesc.out
+++ b/Test/baseResults/spv.450.tesc.out
@@ -43,36 +43,36 @@ Validation failed
                               MemberName 42(bn) 1  "v2"
                               MemberName 42(bn) 2  "v3"
                               Name 44  ""
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
                               Decorate 18(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 21(gl_PerVertex) Block
                               MemberDecorate 21(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 21(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 21(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 21(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 21(gl_PerVertex) Block
                               Decorate 32(patchOut) Patch
                               Decorate 32(patchOut) Location 1
+                              Decorate 34(TheBlock) Block
                               MemberDecorate 34(TheBlock) 0 Patch
                               MemberDecorate 34(TheBlock) 1 Patch
                               MemberDecorate 34(TheBlock) 2 Patch
-                              Decorate 34(TheBlock) Block
                               Decorate 38(tcBlock) Location 12
+                              Decorate 39(SingleBlock) Block
                               MemberDecorate 39(SingleBlock) 0 Patch
                               MemberDecorate 39(SingleBlock) 1 Patch
                               MemberDecorate 39(SingleBlock) 2 Patch
-                              Decorate 39(SingleBlock) Block
                               Decorate 41(singleBlock) Location 2
+                              Decorate 42(bn) Block
                               MemberDecorate 42(bn) 0 Patch
                               MemberDecorate 42(bn) 0 Location 20
                               MemberDecorate 42(bn) 1 Patch
                               MemberDecorate 42(bn) 1 Location 24
                               MemberDecorate 42(bn) 2 Patch
                               MemberDecorate 42(bn) 2 Location 25
-                              Decorate 42(bn) Block
                               Decorate 44 Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.460.frag.out b/Test/baseResults/spv.460.frag.out
index 4201fbb8..e40e833f 100644
--- a/Test/baseResults/spv.460.frag.out
+++ b/Test/baseResults/spv.460.frag.out
@@ -15,9 +15,9 @@ spv.460.frag
                               Name 4  "main"
                               Name 8  "aui"
                               Name 10  "ui"
-                              Decorate 8(aui) Offset 0
-                              Decorate 8(aui) DescriptorSet 0
                               Decorate 8(aui) Binding 0
+                              Decorate 8(aui) DescriptorSet 0
+                              Decorate 8(aui) Offset 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.460.subgroupEXT.mesh.out b/Test/baseResults/spv.460.subgroupEXT.mesh.out
index f41895fd..112d50d2 100644
--- a/Test/baseResults/spv.460.subgroupEXT.mesh.out
+++ b/Test/baseResults/spv.460.subgroupEXT.mesh.out
@@ -79,20 +79,20 @@ spv.460.subgroupEXT.mesh
                               Name 253  "ballot"
                               Decorate 35(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 41(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 54(gl_MeshPerVertexEXT) Block
                               MemberDecorate 54(gl_MeshPerVertexEXT) 0 BuiltIn Position
                               MemberDecorate 54(gl_MeshPerVertexEXT) 1 BuiltIn PointSize
                               MemberDecorate 54(gl_MeshPerVertexEXT) 2 BuiltIn ClipDistance
                               MemberDecorate 54(gl_MeshPerVertexEXT) 3 BuiltIn CullDistance
-                              Decorate 54(gl_MeshPerVertexEXT) Block
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
-                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
                               Decorate 106(gl_MeshPerPrimitiveEXT) Block
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
+                              MemberDecorate 106(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
                               Decorate 147(gl_PrimitiveTriangleIndicesEXT) BuiltIn PrimitiveTriangleIndicesEXT
                               Decorate 161(gl_SubgroupSize) RelaxedPrecision
                               Decorate 161(gl_SubgroupSize) BuiltIn SubgroupSize
diff --git a/Test/baseResults/spv.460.subgroupEXT.task.out b/Test/baseResults/spv.460.subgroupEXT.task.out
index efe30b75..4424b2ac 100644
--- a/Test/baseResults/spv.460.subgroupEXT.task.out
+++ b/Test/baseResults/spv.460.subgroupEXT.task.out
@@ -70,13 +70,13 @@ spv.460.subgroupEXT.task
                               Name 216  "ballot"
                               Decorate 35(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 41(gl_WorkGroupID) BuiltIn WorkgroupId
-                              MemberDecorate 59(block0) 0 Offset 0
                               Decorate 59(block0) Block
-                              Decorate 61 DescriptorSet 0
+                              MemberDecorate 59(block0) 0 Offset 0
                               Decorate 61 Binding 1
-                              Decorate 77(uni_image) DescriptorSet 0
-                              Decorate 77(uni_image) Binding 0
+                              Decorate 61 DescriptorSet 0
                               Decorate 77(uni_image) NonReadable
+                              Decorate 77(uni_image) Binding 0
+                              Decorate 77(uni_image) DescriptorSet 0
                               Decorate 123(gl_SubgroupSize) RelaxedPrecision
                               Decorate 123(gl_SubgroupSize) BuiltIn SubgroupSize
                               Decorate 124(gl_SubgroupInvocationID) RelaxedPrecision
diff --git a/Test/baseResults/spv.8bit-16bit-construction.frag.out b/Test/baseResults/spv.8bit-16bit-construction.frag.out
index 9a85a6ac..78e941a2 100644
--- a/Test/baseResults/spv.8bit-16bit-construction.frag.out
+++ b/Test/baseResults/spv.8bit-16bit-construction.frag.out
@@ -24,14 +24,14 @@ Validation failed
                               MemberName 11(B) 3  "u16_from_u8"
                               MemberName 11(B) 4  "f16_from_i8"
                               Name 13  ""
+                              Decorate 11(B) BufferBlock
                               MemberDecorate 11(B) 0 Offset 0
                               MemberDecorate 11(B) 1 Offset 2
                               MemberDecorate 11(B) 2 Offset 4
                               MemberDecorate 11(B) 3 Offset 6
                               MemberDecorate 11(B) 4 Offset 8
-                              Decorate 11(B) BufferBlock
-                              Decorate 13 DescriptorSet 0
                               Decorate 13 Binding 0
+                              Decorate 13 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 8 1
diff --git a/Test/baseResults/spv.8bitstorage-int.frag.out b/Test/baseResults/spv.8bitstorage-int.frag.out
index 25db1d86..a40e2c1d 100644
--- a/Test/baseResults/spv.8bitstorage-int.frag.out
+++ b/Test/baseResults/spv.8bitstorage-int.frag.out
@@ -82,6 +82,7 @@ spv.8bitstorage-int.frag
                               Decorate 13 ArrayStride 8
                               Decorate 15 ArrayStride 2
                               Decorate 16 ArrayStride 1
+                              Decorate 17(B2) BufferBlock
                               MemberDecorate 17(B2) 0 Offset 0
                               MemberDecorate 17(B2) 1 Offset 2
                               MemberDecorate 17(B2) 2 Offset 4
@@ -90,14 +91,14 @@ spv.8bitstorage-int.frag
                               MemberDecorate 17(B2) 5 Offset 20
                               MemberDecorate 17(B2) 6 Offset 36
                               MemberDecorate 17(B2) 7 Offset 236
-                              Decorate 17(B2) BufferBlock
-                              Decorate 19(b2) DescriptorSet 0
                               Decorate 19(b2) Binding 1
+                              Decorate 19(b2) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
                               MemberDecorate 23(S) 1 Offset 2
                               MemberDecorate 23(S) 2 Offset 4
                               Decorate 24 ArrayStride 16
+                              Decorate 25(B1) Block
                               MemberDecorate 25(B1) 0 Offset 0
                               MemberDecorate 25(B1) 1 Offset 2
                               MemberDecorate 25(B1) 2 Offset 4
@@ -105,9 +106,8 @@ spv.8bitstorage-int.frag
                               MemberDecorate 25(B1) 4 Offset 48
                               MemberDecorate 25(B1) 5 Offset 64
                               MemberDecorate 25(B1) 6 Offset 96
-                              Decorate 25(B1) Block
-                              Decorate 27(b1) DescriptorSet 0
                               Decorate 27(b1) Binding 0
+                              Decorate 27(b1) DescriptorSet 0
                               Decorate 44 ArrayStride 16
                               MemberDecorate 45(S) 0 Offset 0
                               MemberDecorate 45(S) 1 Offset 2
@@ -115,6 +115,7 @@ spv.8bitstorage-int.frag
                               Decorate 46 ArrayStride 16
                               Decorate 47 ArrayStride 16
                               Decorate 48 ArrayStride 16
+                              Decorate 49(B5) Block
                               MemberDecorate 49(B5) 0 Offset 0
                               MemberDecorate 49(B5) 1 Offset 2
                               MemberDecorate 49(B5) 2 Offset 4
@@ -123,29 +124,28 @@ spv.8bitstorage-int.frag
                               MemberDecorate 49(B5) 5 Offset 64
                               MemberDecorate 49(B5) 6 Offset 96
                               MemberDecorate 49(B5) 7 Offset 1696
-                              Decorate 49(B5) Block
-                              Decorate 51(b5) DescriptorSet 0
                               Decorate 51(b5) Binding 2
+                              Decorate 51(b5) DescriptorSet 0
                               MemberDecorate 88(S2) 0 ColMajor
-                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 0 MatrixStride 16
+                              MemberDecorate 88(S2) 0 Offset 0
                               MemberDecorate 88(S2) 1 Offset 64
                               MemberDecorate 88(S2) 2 Offset 68
                               MemberDecorate 89(S3) 0 Offset 0
+                              Decorate 90(B4) BufferBlock
                               MemberDecorate 90(B4) 0 Offset 0
                               MemberDecorate 90(B4) 1 Offset 80
-                              Decorate 90(B4) BufferBlock
-                              Decorate 92(b4) DescriptorSet 0
                               Decorate 92(b4) Binding 4
+                              Decorate 92(b4) DescriptorSet 0
                               MemberDecorate 93(S2) 0 RowMajor
-                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 0 MatrixStride 16
+                              MemberDecorate 93(S2) 0 Offset 0
                               MemberDecorate 93(S2) 1 Offset 64
                               MemberDecorate 93(S2) 2 Offset 68
-                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 94(B3) BufferBlock
-                              Decorate 96(b3) DescriptorSet 0
+                              MemberDecorate 94(B3) 0 Offset 0
                               Decorate 96(b3) Binding 3
+                              Decorate 96(b3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 8 1
diff --git a/Test/baseResults/spv.8bitstorage-ssbo.vert.out b/Test/baseResults/spv.8bitstorage-ssbo.vert.out
index e8e9ca35..19e7d433 100644
--- a/Test/baseResults/spv.8bitstorage-ssbo.vert.out
+++ b/Test/baseResults/spv.8bitstorage-ssbo.vert.out
@@ -19,11 +19,11 @@ spv.8bitstorage-ssbo.vert
                               Name 18  "gl_VertexIndex"
                               Decorate 9(color) Location 0
                               Decorate 11 ArrayStride 1
+                              Decorate 12(Vertices) BufferBlock
                               MemberDecorate 12(Vertices) 0 NonWritable
                               MemberDecorate 12(Vertices) 0 Offset 0
-                              Decorate 12(Vertices) BufferBlock
-                              Decorate 14 DescriptorSet 0
                               Decorate 14 Binding 0
+                              Decorate 14 DescriptorSet 0
                               Decorate 18(gl_VertexIndex) BuiltIn VertexIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.8bitstorage-ubo.vert.out b/Test/baseResults/spv.8bitstorage-ubo.vert.out
index f41f63ee..7dd1e32a 100644
--- a/Test/baseResults/spv.8bitstorage-ubo.vert.out
+++ b/Test/baseResults/spv.8bitstorage-ubo.vert.out
@@ -19,10 +19,10 @@ spv.8bitstorage-ubo.vert
                               Name 20  "gl_VertexIndex"
                               Decorate 9(color) Location 0
                               Decorate 13 ArrayStride 16
-                              MemberDecorate 14(Vertices) 0 Offset 0
                               Decorate 14(Vertices) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(Vertices) 0 Offset 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                               Decorate 20(gl_VertexIndex) BuiltIn VertexIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.8bitstorage-uint.frag.out b/Test/baseResults/spv.8bitstorage-uint.frag.out
index d89756b2..a90edf12 100644
--- a/Test/baseResults/spv.8bitstorage-uint.frag.out
+++ b/Test/baseResults/spv.8bitstorage-uint.frag.out
@@ -82,6 +82,7 @@ spv.8bitstorage-uint.frag
                               Decorate 13 ArrayStride 8
                               Decorate 15 ArrayStride 2
                               Decorate 16 ArrayStride 1
+                              Decorate 17(B2) BufferBlock
                               MemberDecorate 17(B2) 0 Offset 0
                               MemberDecorate 17(B2) 1 Offset 2
                               MemberDecorate 17(B2) 2 Offset 4
@@ -90,14 +91,14 @@ spv.8bitstorage-uint.frag
                               MemberDecorate 17(B2) 5 Offset 20
                               MemberDecorate 17(B2) 6 Offset 36
                               MemberDecorate 17(B2) 7 Offset 236
-                              Decorate 17(B2) BufferBlock
-                              Decorate 19(b2) DescriptorSet 0
                               Decorate 19(b2) Binding 1
+                              Decorate 19(b2) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
                               MemberDecorate 23(S) 1 Offset 2
                               MemberDecorate 23(S) 2 Offset 4
                               Decorate 24 ArrayStride 16
+                              Decorate 25(B1) Block
                               MemberDecorate 25(B1) 0 Offset 0
                               MemberDecorate 25(B1) 1 Offset 2
                               MemberDecorate 25(B1) 2 Offset 4
@@ -105,9 +106,8 @@ spv.8bitstorage-uint.frag
                               MemberDecorate 25(B1) 4 Offset 48
                               MemberDecorate 25(B1) 5 Offset 64
                               MemberDecorate 25(B1) 6 Offset 96
-                              Decorate 25(B1) Block
-                              Decorate 27(b1) DescriptorSet 0
                               Decorate 27(b1) Binding 0
+                              Decorate 27(b1) DescriptorSet 0
                               Decorate 44 ArrayStride 16
                               MemberDecorate 45(S) 0 Offset 0
                               MemberDecorate 45(S) 1 Offset 2
@@ -115,6 +115,7 @@ spv.8bitstorage-uint.frag
                               Decorate 46 ArrayStride 16
                               Decorate 47 ArrayStride 16
                               Decorate 48 ArrayStride 16
+                              Decorate 49(B5) Block
                               MemberDecorate 49(B5) 0 Offset 0
                               MemberDecorate 49(B5) 1 Offset 2
                               MemberDecorate 49(B5) 2 Offset 4
@@ -123,29 +124,28 @@ spv.8bitstorage-uint.frag
                               MemberDecorate 49(B5) 5 Offset 64
                               MemberDecorate 49(B5) 6 Offset 96
                               MemberDecorate 49(B5) 7 Offset 1696
-                              Decorate 49(B5) Block
-                              Decorate 51(b5) DescriptorSet 0
                               Decorate 51(b5) Binding 2
+                              Decorate 51(b5) DescriptorSet 0
                               MemberDecorate 89(S2) 0 ColMajor
-                              MemberDecorate 89(S2) 0 Offset 0
                               MemberDecorate 89(S2) 0 MatrixStride 16
+                              MemberDecorate 89(S2) 0 Offset 0
                               MemberDecorate 89(S2) 1 Offset 64
                               MemberDecorate 89(S2) 2 Offset 68
                               MemberDecorate 90(S3) 0 Offset 0
+                              Decorate 91(B4) BufferBlock
                               MemberDecorate 91(B4) 0 Offset 0
                               MemberDecorate 91(B4) 1 Offset 80
-                              Decorate 91(B4) BufferBlock
-                              Decorate 93(b4) DescriptorSet 0
                               Decorate 93(b4) Binding 4
+                              Decorate 93(b4) DescriptorSet 0
                               MemberDecorate 94(S2) 0 RowMajor
-                              MemberDecorate 94(S2) 0 Offset 0
                               MemberDecorate 94(S2) 0 MatrixStride 16
+                              MemberDecorate 94(S2) 0 Offset 0
                               MemberDecorate 94(S2) 1 Offset 64
                               MemberDecorate 94(S2) 2 Offset 68
-                              MemberDecorate 95(B3) 0 Offset 0
                               Decorate 95(B3) BufferBlock
-                              Decorate 97(b3) DescriptorSet 0
+                              MemberDecorate 95(B3) 0 Offset 0
                               Decorate 97(b3) Binding 3
+                              Decorate 97(b3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 8 0
diff --git a/Test/baseResults/spv.ARMCoreBuiltIns.frag.out b/Test/baseResults/spv.ARMCoreBuiltIns.frag.out
index ccfb4093..6da6921b 100644
--- a/Test/baseResults/spv.ARMCoreBuiltIns.frag.out
+++ b/Test/baseResults/spv.ARMCoreBuiltIns.frag.out
@@ -20,17 +20,17 @@ spv.ARMCoreBuiltIns.frag
                               Name 17  "gl_CoreCountARM"
                               Name 19  "gl_CoreMaxIDARM"
                               Name 21  "gl_WarpIDARM"
-                              Decorate 10(gl_WarpMaxIDARM) Flat
                               Decorate 10(gl_WarpMaxIDARM) BuiltIn BuiltInWarpMaxIDARM
+                              Decorate 10(gl_WarpMaxIDARM) Flat
                               Decorate 14(data) Location 0
-                              Decorate 15(gl_CoreIDARM) Flat
                               Decorate 15(gl_CoreIDARM) BuiltIn CoreIDARM
-                              Decorate 17(gl_CoreCountARM) Flat
+                              Decorate 15(gl_CoreIDARM) Flat
                               Decorate 17(gl_CoreCountARM) BuiltIn CoreCountARM
-                              Decorate 19(gl_CoreMaxIDARM) Flat
+                              Decorate 17(gl_CoreCountARM) Flat
                               Decorate 19(gl_CoreMaxIDARM) BuiltIn CoreMaxIDARM
-                              Decorate 21(gl_WarpIDARM) Flat
+                              Decorate 19(gl_CoreMaxIDARM) Flat
                               Decorate 21(gl_WarpIDARM) BuiltIn WarpIDARM
+                              Decorate 21(gl_WarpIDARM) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ARMCoreBuiltIns.vert.out b/Test/baseResults/spv.ARMCoreBuiltIns.vert.out
index 5419be45..e1503add 100644
--- a/Test/baseResults/spv.ARMCoreBuiltIns.vert.out
+++ b/Test/baseResults/spv.ARMCoreBuiltIns.vert.out
@@ -22,10 +22,10 @@ spv.ARMCoreBuiltIns.vert
                               Name 22  "gl_CoreMaxIDARM"
                               Name 24  "gl_WarpIDARM"
                               Decorate 10(gl_WarpMaxIDARM) BuiltIn BuiltInWarpMaxIDARM
-                              MemberDecorate 13(Output) 0 Offset 0
                               Decorate 13(Output) BufferBlock
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13(Output) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               Decorate 18(gl_CoreIDARM) BuiltIn CoreIDARM
                               Decorate 20(gl_CoreCountARM) BuiltIn CoreCountARM
                               Decorate 22(gl_CoreMaxIDARM) BuiltIn CoreMaxIDARM
diff --git a/Test/baseResults/spv.AofA.frag.out b/Test/baseResults/spv.AofA.frag.out
index b2df36a6..9c5a014a 100644
--- a/Test/baseResults/spv.AofA.frag.out
+++ b/Test/baseResults/spv.AofA.frag.out
@@ -41,10 +41,10 @@ Validation failed
                               Decorate 78(infloat) Location 0
                               Decorate 92 ArrayStride 16
                               Decorate 93 ArrayStride 64
-                              MemberDecorate 94(uAofA) 0 Offset 0
                               Decorate 94(uAofA) Block
-                              Decorate 98(nameAofA) DescriptorSet 0
+                              MemberDecorate 94(uAofA) 0 Offset 0
                               Decorate 98(nameAofA) Binding 0
+                              Decorate 98(nameAofA) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.ClosestHitShader.rchit.out b/Test/baseResults/spv.ClosestHitShader.rchit.out
index a84ef23e..af0f80fc 100644
--- a/Test/baseResults/spv.ClosestHitShader.rchit.out
+++ b/Test/baseResults/spv.ClosestHitShader.rchit.out
@@ -57,8 +57,8 @@ spv.ClosestHitShader.rchit
                               Decorate 57(gl_HitKindNV) BuiltIn HitKindKHR
                               Decorate 63(gl_ObjectToWorldNV) BuiltIn ObjectToWorldKHR
                               Decorate 66(gl_WorldToObjectNV) BuiltIn WorldToObjectKHR
-                              Decorate 70(accNV) DescriptorSet 0
                               Decorate 70(accNV) Binding 0
+                              Decorate 70(accNV) DescriptorSet 0
                               Decorate 84(localPayload) Location 0
                               Decorate 86(incomingPayload) Location 1
                2:             TypeVoid
diff --git a/Test/baseResults/spv.ClosestHitShaderMotion.rchit.out b/Test/baseResults/spv.ClosestHitShaderMotion.rchit.out
index e20df80a..846151f0 100644
--- a/Test/baseResults/spv.ClosestHitShaderMotion.rchit.out
+++ b/Test/baseResults/spv.ClosestHitShaderMotion.rchit.out
@@ -19,8 +19,8 @@ spv.ClosestHitShaderMotion.rchit
                               Name 16  "accEXT"
                               Name 32  "incomingPayloadEXT"
                               Decorate 10(gl_CurrentRayTimeNV) BuiltIn CurrentRayTimeNV
-                              Decorate 16(accEXT) DescriptorSet 0
                               Decorate 16(accEXT) Binding 0
+                              Decorate 16(accEXT) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.GeometryShaderPassthrough.geom.out b/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
index 57fa6911..f4e1a9fa 100644
--- a/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
+++ b/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
@@ -23,8 +23,8 @@ spv.GeometryShaderPassthrough.geom
                               MemberName 12(Inputs) 0  "texcoord"
                               MemberName 12(Inputs) 1  "baseColor"
                               Name 14  ""
-                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
                               Decorate 8(gl_PerVertex) Block
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
                               Decorate 10 PassthroughNV
                               Decorate 12(Inputs) Block
                               Decorate 14 Location 0
diff --git a/Test/baseResults/spv.MissShader.rmiss.out b/Test/baseResults/spv.MissShader.rmiss.out
index 581c0c6b..d0f381e3 100644
--- a/Test/baseResults/spv.MissShader.rmiss.out
+++ b/Test/baseResults/spv.MissShader.rmiss.out
@@ -35,8 +35,8 @@ spv.MissShader.rmiss
                               Decorate 29(gl_IncomingRayFlagsNV) BuiltIn IncomingRayFlagsKHR
                               Decorate 34(gl_RayTminNV) BuiltIn RayTminKHR
                               Decorate 37(gl_RayTmaxNV) BuiltIn RayTmaxKHR
-                              Decorate 41(accNV) DescriptorSet 0
                               Decorate 41(accNV) Binding 0
+                              Decorate 41(accNV) DescriptorSet 0
                               Decorate 56(localPayload) Location 0
                               Decorate 58(incomingPayload) Location 1
                2:             TypeVoid
diff --git a/Test/baseResults/spv.MissShaderMotion.rmiss.out b/Test/baseResults/spv.MissShaderMotion.rmiss.out
index 220dda99..455f343f 100644
--- a/Test/baseResults/spv.MissShaderMotion.rmiss.out
+++ b/Test/baseResults/spv.MissShaderMotion.rmiss.out
@@ -19,8 +19,8 @@ spv.MissShaderMotion.rmiss
                               Name 16  "accEXT"
                               Name 32  "localPayloadEXT"
                               Decorate 10(gl_CurrentRayTimeNV) BuiltIn CurrentRayTimeNV
-                              Decorate 16(accEXT) DescriptorSet 0
                               Decorate 16(accEXT) Binding 0
+                              Decorate 16(accEXT) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.OVR_multiview.vert.out b/Test/baseResults/spv.OVR_multiview.vert.out
index df7d9499..1eeae2a1 100644
--- a/Test/baseResults/spv.OVR_multiview.vert.out
+++ b/Test/baseResults/spv.OVR_multiview.vert.out
@@ -20,10 +20,10 @@ spv.OVR_multiview.vert
                               Name 17  "gl_ViewID_OVR"
                               Name 25  "gl_VertexID"
                               Name 26  "gl_InstanceID"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 11(gl_PerVertex) Block
                               Decorate 17(gl_ViewID_OVR) BuiltIn ViewIndex
                               Decorate 25(gl_VertexID) BuiltIn VertexId
                               Decorate 26(gl_InstanceID) BuiltIn InstanceId
diff --git a/Test/baseResults/spv.RayConstants.rgen.out b/Test/baseResults/spv.RayConstants.rgen.out
index ebdcb50b..fb503c93 100644
--- a/Test/baseResults/spv.RayConstants.rgen.out
+++ b/Test/baseResults/spv.RayConstants.rgen.out
@@ -13,8 +13,8 @@ spv.RayConstants.rgen
                               Name 4  "main"
                               Name 8  "accNV"
                               Name 26  "payload"
-                              Decorate 8(accNV) DescriptorSet 0
                               Decorate 8(accNV) Binding 0
+                              Decorate 8(accNV) DescriptorSet 0
                               Decorate 26(payload) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.RayGenShader.rgen.out b/Test/baseResults/spv.RayGenShader.rgen.out
index 01fdbf01..76bc1f62 100644
--- a/Test/baseResults/spv.RayGenShader.rgen.out
+++ b/Test/baseResults/spv.RayGenShader.rgen.out
@@ -26,13 +26,13 @@ spv.RayGenShader.rgen
                               Name 53  "payload"
                               Decorate 11(gl_LaunchIDNV) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
-                              Decorate 29(accNV0) DescriptorSet 0
                               Decorate 29(accNV0) Binding 0
+                              Decorate 29(accNV0) DescriptorSet 0
+                              Decorate 37(block) BufferBlock
                               MemberDecorate 37(block) 0 Offset 0
                               MemberDecorate 37(block) 1 Offset 16
-                              Decorate 37(block) BufferBlock
-                              Decorate 50(accNV1) DescriptorSet 0
                               Decorate 50(accNV1) Binding 1
+                              Decorate 50(accNV1) DescriptorSet 0
                               Decorate 53(payload) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.RayGenShader11.rgen.out b/Test/baseResults/spv.RayGenShader11.rgen.out
index ae55e658..37093889 100644
--- a/Test/baseResults/spv.RayGenShader11.rgen.out
+++ b/Test/baseResults/spv.RayGenShader11.rgen.out
@@ -25,11 +25,11 @@ spv.RayGenShader11.rgen
                               Name 52  "payload"
                               Decorate 11(gl_LaunchIDNV) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
-                              Decorate 29(accNV) DescriptorSet 0
                               Decorate 29(accNV) Binding 0
+                              Decorate 29(accNV) DescriptorSet 0
+                              Decorate 37(block) Block
                               MemberDecorate 37(block) 0 Offset 0
                               MemberDecorate 37(block) 1 Offset 16
-                              Decorate 37(block) Block
                               Decorate 52(payload) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.RayGenShaderArray.rgen.out b/Test/baseResults/spv.RayGenShaderArray.rgen.out
index c3bd1911..ddb2f6bb 100644
--- a/Test/baseResults/spv.RayGenShaderArray.rgen.out
+++ b/Test/baseResults/spv.RayGenShaderArray.rgen.out
@@ -31,14 +31,14 @@ spv.RayGenShaderArray.rgen
                               Name 88  "payload"
                               Decorate 11(gl_LaunchIDNV) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeNV) BuiltIn LaunchSizeKHR
-                              Decorate 30(accNV0) DescriptorSet 0
                               Decorate 30(accNV0) Binding 0
+                              Decorate 30(accNV0) DescriptorSet 0
+                              Decorate 34(block) BufferBlock
                               MemberDecorate 34(block) 0 Offset 0
                               MemberDecorate 34(block) 1 Offset 16
                               MemberDecorate 34(block) 2 Offset 28
-                              Decorate 34(block) BufferBlock
-                              Decorate 60(accNV1) DescriptorSet 0
                               Decorate 60(accNV1) Binding 1
+                              Decorate 60(accNV1) DescriptorSet 0
                               Decorate 75 DecorationNonUniformEXT
                               Decorate 76 DecorationNonUniformEXT
                               Decorate 77 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.RayGenShaderMotion.rgen.out b/Test/baseResults/spv.RayGenShaderMotion.rgen.out
index 9a3421ca..09506757 100644
--- a/Test/baseResults/spv.RayGenShaderMotion.rgen.out
+++ b/Test/baseResults/spv.RayGenShaderMotion.rgen.out
@@ -24,8 +24,8 @@ spv.RayGenShaderMotion.rgen
                               Name 46  "payloadEXT"
                               Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
-                              Decorate 29(accEXT) DescriptorSet 0
                               Decorate 29(accEXT) Binding 0
+                              Decorate 29(accEXT) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out
index 4001462d..e5496d32 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp.out
@@ -21,9 +21,9 @@ spv.WorkgroupMemoryExplicitLayout.16BitAccess.comp
                               MemberName 8(first) 0  "a"
                               MemberName 8(first) 1  "f"
                               Name 10  ""
+                              Decorate 8(first) Block
                               MemberDecorate 8(first) 0 Offset 0
                               MemberDecorate 8(first) 1 Offset 2
-                              Decorate 8(first) Block
                               Decorate 24 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out
index d0906a42..a3f16954 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp.out
@@ -19,8 +19,8 @@ spv.WorkgroupMemoryExplicitLayout.8BitAccess.comp
                               Name 7  "first"
                               MemberName 7(first) 0  "a"
                               Name 9  ""
-                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 7(first) Block
+                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 19 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out
index 2a15286e..33cae8b5 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp.out
@@ -19,13 +19,13 @@ spv.WorkgroupMemoryExplicitLayout.MultiBlock.comp
                               Name 14  "second"
                               MemberName 14(second) 0  "b"
                               Name 16  ""
-                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 7(first) Block
-                              MemberDecorate 14(second) 0 Offset 0
-                              Decorate 14(second) Block
-                              Decorate 23 BuiltIn WorkgroupSize
+                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 9 Aliased
+                              Decorate 14(second) Block
+                              MemberDecorate 14(second) 0 Offset 0
                               Decorate 16 Aliased
+                              Decorate 23 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out
index cb3bd31a..2d484770 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp.out
@@ -16,8 +16,8 @@ spv.WorkgroupMemoryExplicitLayout.SingleBlock.comp
                               Name 7  "first"
                               MemberName 7(first) 0  "a"
                               Name 9  ""
-                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 7(first) Block
+                              MemberDecorate 7(first) 0 Offset 0
                               Decorate 18 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out
index 3d7ece13..a651b635 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.scalar.comp.out
@@ -50,9 +50,9 @@ spv.WorkgroupMemoryExplicitLayout.scalar.comp
                               MemberDecorate 24(S) 8 Offset 196
                               MemberDecorate 24(S) 9 Offset 292
                               Decorate 25 ArrayStride 364
+                              Decorate 26(Block) Block
                               MemberDecorate 26(Block) 0 Offset 0
                               MemberDecorate 26(Block) 1 Offset 364
-                              Decorate 26(Block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out
index 5c8f86d2..bc8a5f64 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std140.comp.out
@@ -49,9 +49,9 @@ spv.WorkgroupMemoryExplicitLayout.std140.comp
                               MemberDecorate 24(S) 8 Offset 384
                               MemberDecorate 24(S) 9 Offset 480
                               Decorate 25 ArrayStride 768
+                              Decorate 26(Block) Block
                               MemberDecorate 26(Block) 0 Offset 0
                               MemberDecorate 26(Block) 1 Offset 768
-                              Decorate 26(Block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out
index bfc35e98..a60209d9 100644
--- a/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out
+++ b/Test/baseResults/spv.WorkgroupMemoryExplicitLayout.std430.comp.out
@@ -49,9 +49,9 @@ spv.WorkgroupMemoryExplicitLayout.std430.comp
                               MemberDecorate 24(S) 8 Offset 240
                               MemberDecorate 24(S) 9 Offset 336
                               Decorate 25 ArrayStride 416
+                              Decorate 26(Block) Block
                               MemberDecorate 26(Block) 0 Offset 0
                               MemberDecorate 26(Block) 1 Offset 416
-                              Decorate 26(Block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.aggOps.frag.out b/Test/baseResults/spv.aggOps.frag.out
index bc19f23f..47527996 100644
--- a/Test/baseResults/spv.aggOps.frag.out
+++ b/Test/baseResults/spv.aggOps.frag.out
@@ -51,21 +51,21 @@ WARNING: 0:4: '' : all default precisions are highp; use precision statements to
                               MemberDecorate 56(s2) 0 Offset 0
                               MemberDecorate 56(s2) 1 Offset 4
                               MemberDecorate 56(s2) 2 Offset 16
-                              MemberDecorate 57(ub1) 0 Offset 0
                               Decorate 57(ub1) Block
-                              Decorate 59(uName1) DescriptorSet 0
+                              MemberDecorate 57(ub1) 0 Offset 0
                               Decorate 59(uName1) Binding 1
+                              Decorate 59(uName1) DescriptorSet 0
                               MemberDecorate 64(s1) 0 Offset 0
                               MemberDecorate 64(s1) 1 Offset 4
                               MemberDecorate 65(s2) 0 Offset 0
                               MemberDecorate 65(s2) 1 Offset 4
                               MemberDecorate 65(s2) 2 Offset 8
-                              MemberDecorate 66(ub2) 0 Offset 0
                               Decorate 66(ub2) BufferBlock
-                              Decorate 68(uName2) DescriptorSet 0
+                              MemberDecorate 66(ub2) 0 Offset 0
                               Decorate 68(uName2) Binding 2
-                              Decorate 97(samp2D) DescriptorSet 0
+                              Decorate 68(uName2) DescriptorSet 0
                               Decorate 97(samp2D) Binding 0
+                              Decorate 97(samp2D) DescriptorSet 0
                               Decorate 101(coord) RelaxedPrecision
                               Decorate 101(coord) Location 0
                               Decorate 102 RelaxedPrecision
diff --git a/Test/baseResults/spv.arbPostDepthCoverage.frag.out b/Test/baseResults/spv.arbPostDepthCoverage.frag.out
index 5daa156d..a36b9ee4 100644
--- a/Test/baseResults/spv.arbPostDepthCoverage.frag.out
+++ b/Test/baseResults/spv.arbPostDepthCoverage.frag.out
@@ -19,8 +19,8 @@ spv.arbPostDepthCoverage.frag
                               Name 8  "readSampleMaskIn"
                               Name 13  "gl_SampleMaskIn"
                               Decorate 8(readSampleMaskIn) Location 0
-                              Decorate 13(gl_SampleMaskIn) Flat
                               Decorate 13(gl_SampleMaskIn) BuiltIn SampleMask
+                              Decorate 13(gl_SampleMaskIn) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.atomiAddEXT.task.out b/Test/baseResults/spv.atomiAddEXT.task.out
index 9ff35aa6..bf937240 100644
--- a/Test/baseResults/spv.atomiAddEXT.task.out
+++ b/Test/baseResults/spv.atomiAddEXT.task.out
@@ -23,17 +23,17 @@ spv.atomiAddEXT.task
                               Name 26  "taskBlock"
                               MemberName 26(taskBlock) 0  "atom1"
                               Name 28  "mytask"
+                              Decorate 7(Buffer) Block
                               MemberDecorate 7(Buffer) 0 Coherent
                               MemberDecorate 7(Buffer) 0 Offset 0
-                              Decorate 7(Buffer) Block
-                              Decorate 9 DescriptorSet 0
                               Decorate 9 Binding 1
+                              Decorate 9 DescriptorSet 0
                               Decorate 19 ArrayStride 4
                               MemberDecorate 20(structType) 0 Offset 0
-                              MemberDecorate 21(t2) 0 Offset 0
                               Decorate 21(t2) Block
-                              Decorate 23(t) DescriptorSet 0
+                              MemberDecorate 21(t2) 0 Offset 0
                               Decorate 23(t) Binding 0
+                              Decorate 23(t) DescriptorSet 0
                               Decorate 33 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.atomic.comp.out b/Test/baseResults/spv.atomic.comp.out
index 7c001ae1..53548089 100644
--- a/Test/baseResults/spv.atomic.comp.out
+++ b/Test/baseResults/spv.atomic.comp.out
@@ -29,19 +29,19 @@ spv.atomic.comp
                               Name 71  "arrX"
                               Name 72  "arrY"
                               Name 73  "arrZ"
-                              Decorate 20(counter) Offset 0
-                              Decorate 20(counter) DescriptorSet 0
                               Decorate 20(counter) Binding 0
-                              Decorate 27(countArr) Offset 4
-                              Decorate 27(countArr) DescriptorSet 0
+                              Decorate 20(counter) DescriptorSet 0
+                              Decorate 20(counter) Offset 0
                               Decorate 27(countArr) Binding 0
+                              Decorate 27(countArr) DescriptorSet 0
+                              Decorate 27(countArr) Offset 4
+                              Decorate 62(dataSSB) BufferBlock
                               MemberDecorate 62(dataSSB) 0 Restrict
                               MemberDecorate 62(dataSSB) 0 Offset 0
                               MemberDecorate 62(dataSSB) 1 Restrict
                               MemberDecorate 62(dataSSB) 1 Offset 16
-                              Decorate 62(dataSSB) BufferBlock
-                              Decorate 64(result) DescriptorSet 0
                               Decorate 64(result) Binding 0
+                              Decorate 64(result) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.atomicAdd.bufferReference.comp.out b/Test/baseResults/spv.atomicAdd.bufferReference.comp.out
index a00c45a3..31edb5e9 100644
--- a/Test/baseResults/spv.atomicAdd.bufferReference.comp.out
+++ b/Test/baseResults/spv.atomicAdd.bufferReference.comp.out
@@ -56,25 +56,25 @@ spv.atomicAdd.bufferReference.comp
                               MemberName 179(Fail) 0  "x"
                               Name 181  "fail"
                               Decorate 17 ArrayStride 4
-                              MemberDecorate 18(PayloadRef) 0 Offset 0
                               Decorate 18(PayloadRef) Block
+                              MemberDecorate 18(PayloadRef) 0 Offset 0
                               Decorate 20(payload) DecorationAliasedPointerEXT
+                              Decorate 22(PC) Block
                               MemberDecorate 22(PC) 0 Offset 0
                               MemberDecorate 22(PC) 1 Offset 8
-                              Decorate 22(PC) Block
                               Decorate 23 ArrayStride 4
-                              MemberDecorate 24(GuardRef) 0 Offset 0
                               Decorate 24(GuardRef) Block
+                              MemberDecorate 24(GuardRef) 0 Offset 0
                               Decorate 37(gl_GlobalInvocationID) BuiltIn GlobalInvocationId
                               Decorate 43(DIM) SpecId 0
                               Decorate 44(NUM_WORKGROUP_EACH_DIM) SpecId 1
                               Decorate 81(gl_WorkGroupID) BuiltIn WorkgroupId
                               Decorate 133(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 178 ArrayStride 4
-                              MemberDecorate 179(Fail) 0 Offset 0
                               Decorate 179(Fail) Block
-                              Decorate 181(fail) DescriptorSet 0
+                              MemberDecorate 179(Fail) 0 Offset 0
                               Decorate 181(fail) Binding 2
+                              Decorate 181(fail) DescriptorSet 0
                               Decorate 185 SpecId 0
                               Decorate 186 SpecId 0
                               Decorate 187 BuiltIn WorkgroupSize
diff --git a/Test/baseResults/spv.atomicFloat.comp.out b/Test/baseResults/spv.atomicFloat.comp.out
index acb5d817..c7b8f489 100644
--- a/Test/baseResults/spv.atomicFloat.comp.out
+++ b/Test/baseResults/spv.atomicFloat.comp.out
@@ -38,35 +38,35 @@ spv.atomicFloat.comp
                               Name 352  "fimageCube"
                               Name 392  "fimageCubeArray"
                               Name 430  "fimage3D"
+                              Decorate 25(Buffer) BufferBlock
                               MemberDecorate 25(Buffer) 0 Offset 0
                               MemberDecorate 25(Buffer) 1 Offset 8
-                              Decorate 25(Buffer) BufferBlock
-                              Decorate 27(buf) DescriptorSet 0
                               Decorate 27(buf) Binding 0
+                              Decorate 27(buf) DescriptorSet 0
                               Decorate 143(fimage1D) Location 0
-                              Decorate 143(fimage1D) DescriptorSet 0
                               Decorate 143(fimage1D) Binding 0
+                              Decorate 143(fimage1D) DescriptorSet 0
                               Decorate 189(fimage1DArray) Location 1
-                              Decorate 189(fimage1DArray) DescriptorSet 0
                               Decorate 189(fimage1DArray) Binding 1
+                              Decorate 189(fimage1DArray) DescriptorSet 0
                               Decorate 232(fimage2D) Location 2
-                              Decorate 232(fimage2D) DescriptorSet 0
                               Decorate 232(fimage2D) Binding 2
+                              Decorate 232(fimage2D) DescriptorSet 0
                               Decorate 270(fimage2DRect) Location 4
-                              Decorate 270(fimage2DRect) DescriptorSet 0
                               Decorate 270(fimage2DRect) Binding 4
+                              Decorate 270(fimage2DRect) DescriptorSet 0
                               Decorate 308(fimage2DArray) Location 3
-                              Decorate 308(fimage2DArray) DescriptorSet 0
                               Decorate 308(fimage2DArray) Binding 3
+                              Decorate 308(fimage2DArray) DescriptorSet 0
                               Decorate 352(fimageCube) Location 5
-                              Decorate 352(fimageCube) DescriptorSet 0
                               Decorate 352(fimageCube) Binding 5
+                              Decorate 352(fimageCube) DescriptorSet 0
                               Decorate 392(fimageCubeArray) Location 6
-                              Decorate 392(fimageCubeArray) DescriptorSet 0
                               Decorate 392(fimageCubeArray) Binding 6
+                              Decorate 392(fimageCubeArray) DescriptorSet 0
                               Decorate 430(fimage3D) Location 7
-                              Decorate 430(fimage3D) DescriptorSet 0
                               Decorate 430(fimage3D) Binding 9
+                              Decorate 430(fimage3D) DescriptorSet 0
                               Decorate 469 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.atomicInt64.comp.out b/Test/baseResults/spv.atomicInt64.comp.out
index 24805ccc..2464e506 100644
--- a/Test/baseResults/spv.atomicInt64.comp.out
+++ b/Test/baseResults/spv.atomicInt64.comp.out
@@ -24,11 +24,11 @@ spv.atomicInt64.comp
                               MemberName 84(Struct) 0  "i64"
                               MemberName 84(Struct) 1  "u64"
                               Name 86  "s"
+                              Decorate 14(Buffer) BufferBlock
                               MemberDecorate 14(Buffer) 0 Offset 0
                               MemberDecorate 14(Buffer) 1 Offset 8
-                              Decorate 14(Buffer) BufferBlock
-                              Decorate 16(buf) DescriptorSet 0
                               Decorate 16(buf) Binding 0
+                              Decorate 16(buf) DescriptorSet 0
                               Decorate 148 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.atomicStoreInt64.comp.out b/Test/baseResults/spv.atomicStoreInt64.comp.out
index c2b3f30d..9114bc34 100644
--- a/Test/baseResults/spv.atomicStoreInt64.comp.out
+++ b/Test/baseResults/spv.atomicStoreInt64.comp.out
@@ -21,14 +21,14 @@ spv.atomicStoreInt64.comp
                               Name 14  "ubo"
                               MemberName 14(ubo) 0  "z"
                               Name 16  ""
-                              MemberDecorate 7(ssbo) 0 Offset 0
                               Decorate 7(ssbo) BufferBlock
-                              Decorate 9 DescriptorSet 0
+                              MemberDecorate 7(ssbo) 0 Offset 0
                               Decorate 9 Binding 0
-                              MemberDecorate 14(ubo) 0 Offset 0
+                              Decorate 9 DescriptorSet 0
                               Decorate 14(ubo) Block
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(ubo) 0 Offset 0
                               Decorate 16 Binding 1
+                              Decorate 16 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 64 0
diff --git a/Test/baseResults/spv.bool.vert.out b/Test/baseResults/spv.bool.vert.out
index 265d9007..dbab6986 100644
--- a/Test/baseResults/spv.bool.vert.out
+++ b/Test/baseResults/spv.bool.vert.out
@@ -21,15 +21,15 @@ spv.bool.vert
                               MemberName 27(ubname) 0  "b"
                               Name 29  "ubinst"
                               Name 30  "param"
+                              Decorate 22(gl_PerVertex) Block
                               MemberDecorate 22(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 22(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 22(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 22(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 22(gl_PerVertex) Block
-                              MemberDecorate 27(ubname) 0 Offset 0
                               Decorate 27(ubname) Block
-                              Decorate 29(ubinst) DescriptorSet 0
+                              MemberDecorate 27(ubname) 0 Offset 0
                               Decorate 29(ubinst) Binding 0
+                              Decorate 29(ubinst) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeBool
diff --git a/Test/baseResults/spv.boolInBlock.frag.out b/Test/baseResults/spv.boolInBlock.frag.out
index c234cb4d..9db304a5 100644
--- a/Test/baseResults/spv.boolInBlock.frag.out
+++ b/Test/baseResults/spv.boolInBlock.frag.out
@@ -23,14 +23,14 @@ spv.boolInBlock.frag
                               Name 60  "param"
                               Name 66  "param"
                               Name 74  "fragColor"
-                              MemberDecorate 25(Buffer) 0 Offset 0
                               Decorate 25(Buffer) BufferBlock
-                              Decorate 27 DescriptorSet 0
+                              MemberDecorate 25(Buffer) 0 Offset 0
                               Decorate 27 Binding 1
-                              MemberDecorate 40(Uniform) 0 Offset 0
+                              Decorate 27 DescriptorSet 0
                               Decorate 40(Uniform) Block
-                              Decorate 42 DescriptorSet 0
+                              MemberDecorate 40(Uniform) 0 Offset 0
                               Decorate 42 Binding 0
+                              Decorate 42 DescriptorSet 0
                               Decorate 74(fragColor) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.branch-return.vert.out b/Test/baseResults/spv.branch-return.vert.out
index 53ef8765..86df58af 100644
--- a/Test/baseResults/spv.branch-return.vert.out
+++ b/Test/baseResults/spv.branch-return.vert.out
@@ -15,9 +15,9 @@ spv.branch-return.vert
                               MemberName 18(gl_PerVertex) 1  "gl_PointSize"
                               Name 20  ""
                               Decorate 8(gl_InstanceIndex) BuiltIn InstanceIndex
+                              Decorate 18(gl_PerVertex) Block
                               MemberDecorate 18(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 18(gl_PerVertex) 1 BuiltIn PointSize
-                              Decorate 18(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.buffer.autoassign.frag.out b/Test/baseResults/spv.buffer.autoassign.frag.out
index 3afe6439..0ccd8408 100644
--- a/Test/baseResults/spv.buffer.autoassign.frag.out
+++ b/Test/baseResults/spv.buffer.autoassign.frag.out
@@ -25,19 +25,19 @@ spv.buffer.autoassign.frag
                               MemberName 34(MyUB3) 0  "g_d"
                               Name 36  ""
                               Name 47  "@entryPointOutput.Color"
+                              Decorate 16(MyUB1) Block
                               MemberDecorate 16(MyUB1) 0 Offset 0
                               MemberDecorate 16(MyUB1) 1 Offset 4
-                              Decorate 16(MyUB1) Block
-                              Decorate 18 DescriptorSet 0
                               Decorate 18 Binding 20
-                              MemberDecorate 28(MyUB2) 0 Offset 0
+                              Decorate 18 DescriptorSet 0
                               Decorate 28(MyUB2) Block
-                              Decorate 30 DescriptorSet 0
+                              MemberDecorate 28(MyUB2) 0 Offset 0
                               Decorate 30 Binding 15
-                              MemberDecorate 34(MyUB3) 0 Offset 0
+                              Decorate 30 DescriptorSet 0
                               Decorate 34(MyUB3) Block
-                              Decorate 36 DescriptorSet 0
+                              MemberDecorate 34(MyUB3) 0 Offset 0
                               Decorate 36 Binding 16
+                              Decorate 36 DescriptorSet 0
                               Decorate 47(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle1.frag.out b/Test/baseResults/spv.bufferhandle1.frag.out
index c44ad2a6..6fb4dcce 100644
--- a/Test/baseResults/spv.bufferhandle1.frag.out
+++ b/Test/baseResults/spv.bufferhandle1.frag.out
@@ -29,10 +29,11 @@ spv.bufferhandle1.frag
                               MemberName 13(blockType) 6  "g"
                               Name 15  "t"
                               Name 28  "j"
+                              Decorate 7(t2) Block
                               MemberDecorate 7(t2) 0 Offset 0
                               MemberDecorate 7(t2) 1 Offset 8
-                              Decorate 7(t2) Block
                               Decorate 11 ArrayStride 4
+                              Decorate 13(blockType) Block
                               MemberDecorate 13(blockType) 0 Offset 0
                               MemberDecorate 13(blockType) 1 Offset 4
                               MemberDecorate 13(blockType) 2 Offset 8
@@ -40,9 +41,8 @@ spv.bufferhandle1.frag
                               MemberDecorate 13(blockType) 4 Offset 16
                               MemberDecorate 13(blockType) 5 Offset 32
                               MemberDecorate 13(blockType) 6 Offset 48
-                              Decorate 13(blockType) Block
-                              Decorate 15(t) DescriptorSet 0
                               Decorate 15(t) Binding 0
+                              Decorate 15(t) DescriptorSet 0
                               Decorate 28(j) DecorationAliasedPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle10.frag.out b/Test/baseResults/spv.bufferhandle10.frag.out
index 93c3f70a..d2b8719e 100644
--- a/Test/baseResults/spv.bufferhandle10.frag.out
+++ b/Test/baseResults/spv.bufferhandle10.frag.out
@@ -25,13 +25,13 @@ spv.bufferhandle10.frag
                               Name 19  "i"
                               Name 28  "b"
                               Name 34  "b2"
-                              MemberDecorate 7(t2) 0 Offset 0
                               Decorate 7(t2) Block
+                              MemberDecorate 7(t2) 0 Offset 0
                               Decorate 9 ArrayStride 4
-                              MemberDecorate 10(blockType) 0 Offset 0
                               Decorate 10(blockType) Block
-                              Decorate 12(t) DescriptorSet 0
+                              MemberDecorate 10(blockType) 0 Offset 0
                               Decorate 12(t) Binding 0
+                              Decorate 12(t) DescriptorSet 0
                               Decorate 19(i) Flat
                               Decorate 19(i) Location 0
                               Decorate 28(b) DecorationAliasedPointerEXT
diff --git a/Test/baseResults/spv.bufferhandle11.frag.out b/Test/baseResults/spv.bufferhandle11.frag.out
index eec3cf34..a24406b1 100644
--- a/Test/baseResults/spv.bufferhandle11.frag.out
+++ b/Test/baseResults/spv.bufferhandle11.frag.out
@@ -35,14 +35,14 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
                               Name 48  "AcBlock"
                               MemberName 48(AcBlock) 0  "ac_numPassed"
                               Name 50  ""
-                              MemberDecorate 26(PC) 0 Offset 0
                               Decorate 26(PC) Block
-                              MemberDecorate 28(Block) 0 Offset 0
+                              MemberDecorate 26(PC) 0 Offset 0
                               Decorate 28(Block) Block
-                              MemberDecorate 48(AcBlock) 0 Offset 0
+                              MemberDecorate 28(Block) 0 Offset 0
                               Decorate 48(AcBlock) Block
-                              Decorate 50 DescriptorSet 0
+                              MemberDecorate 48(AcBlock) 0 Offset 0
                               Decorate 50 Binding 0
+                              Decorate 50 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.bufferhandle12.frag.out b/Test/baseResults/spv.bufferhandle12.frag.out
index 319684f8..66ba75a6 100644
--- a/Test/baseResults/spv.bufferhandle12.frag.out
+++ b/Test/baseResults/spv.bufferhandle12.frag.out
@@ -67,26 +67,26 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
                               Name 167  "AcBlock"
                               MemberName 167(AcBlock) 0  "ac_numPassed"
                               Name 169  ""
+                              Decorate 139(PC) Block
                               MemberDecorate 139(PC) 0 Offset 0
                               MemberDecorate 139(PC) 1 Offset 8
                               MemberDecorate 139(PC) 2 Offset 16
-                              Decorate 139(PC) Block
+                              Decorate 141(BlockB) Block
                               MemberDecorate 141(BlockB) 0 Offset 0
                               MemberDecorate 141(BlockB) 1 Offset 8
-                              Decorate 141(BlockB) Block
-                              MemberDecorate 142(BlockC) 0 ColMajor
-                              MemberDecorate 142(BlockC) 0 RelaxedPrecision
-                              MemberDecorate 142(BlockC) 0 Offset 0
-                              MemberDecorate 142(BlockC) 0 MatrixStride 16
                               Decorate 142(BlockC) Block
+                              MemberDecorate 142(BlockC) 0 RelaxedPrecision
+                              MemberDecorate 142(BlockC) 0 ColMajor
+                              MemberDecorate 142(BlockC) 0 MatrixStride 16
+                              MemberDecorate 142(BlockC) 0 Offset 0
+                              Decorate 143(BlockD) Block
                               MemberDecorate 143(BlockD) 0 RelaxedPrecision
                               MemberDecorate 143(BlockD) 0 Offset 0
-                              Decorate 143(BlockD) Block
                               Decorate 160 RelaxedPrecision
-                              MemberDecorate 167(AcBlock) 0 Offset 0
                               Decorate 167(AcBlock) Block
-                              Decorate 169 DescriptorSet 0
+                              MemberDecorate 167(AcBlock) 0 Offset 0
                               Decorate 169 Binding 0
+                              Decorate 169 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.bufferhandle13.frag.out b/Test/baseResults/spv.bufferhandle13.frag.out
index 84eb884c..cb98c1ad 100644
--- a/Test/baseResults/spv.bufferhandle13.frag.out
+++ b/Test/baseResults/spv.bufferhandle13.frag.out
@@ -33,23 +33,23 @@ spv.bufferhandle13.frag
                               Name 52  "param"
                               Name 56  "g1"
                               Name 57  "g2"
-                              MemberDecorate 8(t4) 0 Offset 0
                               Decorate 8(t4) Block
+                              MemberDecorate 8(t4) 0 Offset 0
                               Decorate 10(y) Aliased
                               Decorate 15(y) DecorationAliasedPointerEXT
                               Decorate 18(y) Restrict
                               Decorate 21(y) Restrict
                               Decorate 21(y) DecorationRestrictPointerEXT
                               Decorate 34(a) DecorationAliasedPointerEXT
-                              MemberDecorate 35(t5) 0 Offset 0
                               Decorate 35(t5) Block
-                              Decorate 37(s5) DescriptorSet 0
+                              MemberDecorate 35(t5) 0 Offset 0
                               Decorate 37(s5) Binding 0
+                              Decorate 37(s5) DescriptorSet 0
                               Decorate 42(b) DecorationRestrictPointerEXT
-                              Decorate 56(g1) DecorationAliasedPointerEXT
-                              Decorate 57(g2) DecorationRestrictPointerEXT
                               Decorate 47(param) DecorationAliasedPointerEXT
                               Decorate 52(param) DecorationAliasedPointerEXT
+                              Decorate 56(g1) DecorationAliasedPointerEXT
+                              Decorate 57(g2) DecorationRestrictPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.bufferhandle14.frag.out b/Test/baseResults/spv.bufferhandle14.frag.out
index 4f994e19..c1069240 100644
--- a/Test/baseResults/spv.bufferhandle14.frag.out
+++ b/Test/baseResults/spv.bufferhandle14.frag.out
@@ -33,25 +33,25 @@ spv.bufferhandle14.frag
                               MemberName 38(T4) 1  "j"
                               MemberName 38(T4) 2  "k"
                               Name 40  "t4"
+                              Decorate 8(T1) Block
                               MemberDecorate 8(T1) 0 Offset 0
                               MemberDecorate 8(T1) 1 Offset 4
                               MemberDecorate 8(T1) 2 Offset 8
-                              Decorate 8(T1) Block
                               Decorate 10(t1) DecorationAliasedPointerEXT
+                              Decorate 20(T2) Block
                               MemberDecorate 20(T2) 0 Offset 0
                               MemberDecorate 20(T2) 1 Offset 4
                               MemberDecorate 20(T2) 2 Offset 8
-                              Decorate 20(T2) Block
                               Decorate 22(t2) DecorationAliasedPointerEXT
+                              Decorate 29(T3) Block
                               MemberDecorate 29(T3) 0 Offset 0
                               MemberDecorate 29(T3) 1 Offset 4
                               MemberDecorate 29(T3) 2 Offset 8
-                              Decorate 29(T3) Block
                               Decorate 31(t3) DecorationAliasedPointerEXT
+                              Decorate 38(T4) Block
                               MemberDecorate 38(T4) 0 Offset 0
                               MemberDecorate 38(T4) 1 Offset 4
                               MemberDecorate 38(T4) 2 Offset 8
-                              Decorate 38(T4) Block
                               Decorate 40(t4) DecorationAliasedPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle15.frag.out b/Test/baseResults/spv.bufferhandle15.frag.out
index 34d3d598..6bd429a9 100644
--- a/Test/baseResults/spv.bufferhandle15.frag.out
+++ b/Test/baseResults/spv.bufferhandle15.frag.out
@@ -36,29 +36,29 @@ WARNING: 0:16: '' : all default precisions are highp; use precision statements t
                               Name 31  "t4"
                               Name 37  "i"
                               Name 52  "z"
+                              Decorate 13(T4) Block
                               MemberDecorate 13(T4) 0 Offset 0
                               MemberDecorate 13(T4) 1 Offset 8
                               MemberDecorate 13(T4) 2 Offset 16
-                              Decorate 13(T4) Block
                               Decorate 14 ArrayStride 12
-                              MemberDecorate 15(T1) 0 Offset 0
                               Decorate 15(T1) Block
+                              MemberDecorate 15(T1) 0 Offset 0
                               Decorate 18 ArrayStride 12
                               Decorate 20 ArrayStride 24
                               Decorate 21 ArrayStride 96
-                              MemberDecorate 22(T2) 0 Offset 0
                               Decorate 22(T2) Block
+                              MemberDecorate 22(T2) 0 Offset 0
                               Decorate 26 ArrayStride 36
                               MemberDecorate 28(S) 0 Offset 0
-                              MemberDecorate 28(S) 1 ColMajor
                               MemberDecorate 28(S) 1 RelaxedPrecision
-                              MemberDecorate 28(S) 1 Offset 12
+                              MemberDecorate 28(S) 1 ColMajor
                               MemberDecorate 28(S) 1 MatrixStride 12
+                              MemberDecorate 28(S) 1 Offset 12
                               MemberDecorate 28(S) 2 Offset 156
-                              MemberDecorate 29(T3) 0 Offset 0
                               Decorate 29(T3) Block
-                              Decorate 31(t4) DescriptorSet 0
+                              MemberDecorate 29(T3) 0 Offset 0
                               Decorate 31(t4) Binding 0
+                              Decorate 31(t4) DescriptorSet 0
                               Decorate 37(i) Flat
                               Decorate 37(i) Location 0
                               Decorate 59 RelaxedPrecision
diff --git a/Test/baseResults/spv.bufferhandle16.frag.out b/Test/baseResults/spv.bufferhandle16.frag.out
index ee04d361..4952b3d0 100644
--- a/Test/baseResults/spv.bufferhandle16.frag.out
+++ b/Test/baseResults/spv.bufferhandle16.frag.out
@@ -26,9 +26,9 @@ spv.bufferhandle16.frag
                               Name 26  "e"
                               Name 29  "f"
                               Name 46  "x"
+                              Decorate 9(T1) Block
                               MemberDecorate 9(T1) 0 Offset 0
                               MemberDecorate 9(T1) 1 Offset 4
-                              Decorate 9(T1) Block
                               Decorate 11(a) DecorationAliasedPointerEXT
                               Decorate 15(b) DecorationAliasedPointerEXT
                               Decorate 18(c) DecorationAliasedPointerEXT
diff --git a/Test/baseResults/spv.bufferhandle18.frag.out b/Test/baseResults/spv.bufferhandle18.frag.out
index 97c961a7..981a50e1 100644
--- a/Test/baseResults/spv.bufferhandle18.frag.out
+++ b/Test/baseResults/spv.bufferhandle18.frag.out
@@ -37,9 +37,9 @@ spv.bufferhandle18.frag
                               Name 180  "m"
                               Name 190  "x"
                               Name 195  "buf"
+                              Decorate 9(T1) Block
                               MemberDecorate 9(T1) 0 Offset 0
                               MemberDecorate 9(T1) 1 Offset 4
-                              Decorate 9(T1) Block
                               Decorate 11(a) DecorationAliasedPointerEXT
                               Decorate 15(b) DecorationAliasedPointerEXT
                               Decorate 18(c) DecorationAliasedPointerEXT
@@ -49,8 +49,8 @@ spv.bufferhandle18.frag
                               Decorate 59(arr) DecorationAliasedPointerEXT
                               Decorate 130(j) DecorationAliasedPointerEXT
                               Decorate 153(k) DecorationAliasedPointerEXT
-                              MemberDecorate 178(T2) 0 Offset 0
                               Decorate 178(T2) Block
+                              MemberDecorate 178(T2) 0 Offset 0
                               Decorate 180(m) DecorationAliasedPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle2.frag.out b/Test/baseResults/spv.bufferhandle2.frag.out
index 31a39f26..78bcfc07 100644
--- a/Test/baseResults/spv.bufferhandle2.frag.out
+++ b/Test/baseResults/spv.bufferhandle2.frag.out
@@ -27,18 +27,18 @@ spv.bufferhandle2.frag
                               Name 16  "t"
                               Name 34  "b2"
                               Name 37  "b3"
+                              Decorate 8(blockType) Block
                               MemberDecorate 8(blockType) 0 Offset 0
                               MemberDecorate 8(blockType) 1 Offset 4
                               MemberDecorate 8(blockType) 2 Offset 8
                               MemberDecorate 8(blockType) 3 Offset 12
                               MemberDecorate 8(blockType) 4 Offset 16
-                              Decorate 8(blockType) Block
                               Decorate 13(b1) DecorationAliasedPointerEXT
+                              Decorate 14(t2) Block
                               MemberDecorate 14(t2) 0 Offset 0
                               MemberDecorate 14(t2) 1 Offset 8
-                              Decorate 14(t2) Block
-                              Decorate 16(t) DescriptorSet 0
                               Decorate 16(t) Binding 0
+                              Decorate 16(t) DescriptorSet 0
                               Decorate 34(b2) DecorationAliasedPointerEXT
                               Decorate 37(b3) DecorationAliasedPointerEXT
                2:             TypeVoid
diff --git a/Test/baseResults/spv.bufferhandle3.frag.out b/Test/baseResults/spv.bufferhandle3.frag.out
index 9f66b5cf..0a2ab456 100644
--- a/Test/baseResults/spv.bufferhandle3.frag.out
+++ b/Test/baseResults/spv.bufferhandle3.frag.out
@@ -30,25 +30,25 @@ spv.bufferhandle3.frag
                               MemberName 38(t4) 1  "k"
                               Name 40  "x"
                               Name 42  "k"
+                              Decorate 9(t4) Block
                               MemberDecorate 9(t4) 0 Offset 0
                               MemberDecorate 9(t4) 1 Offset 8
-                              Decorate 9(t4) Block
-                              MemberDecorate 10(t3) 0 Offset 0
                               Decorate 10(t3) Block
+                              MemberDecorate 10(t3) 0 Offset 0
                               Decorate 13(y) DecorationAliasedPointerEXT
-                              MemberDecorate 19(t5) 0 Offset 0
                               Decorate 19(t5) Block
-                              Decorate 21(s5) DescriptorSet 0
+                              MemberDecorate 19(t5) 0 Offset 0
                               Decorate 21(s5) Binding 0
+                              Decorate 21(s5) DescriptorSet 0
+                              Decorate 23(param) DecorationAliasedPointerEXT
+                              Decorate 38(t4) Block
                               MemberDecorate 38(t4) 0 Offset 0
                               MemberDecorate 38(t4) 1 Offset 8
-                              Decorate 38(t4) Block
-                              Decorate 40(x) DescriptorSet 1
                               Decorate 40(x) Binding 2
+                              Decorate 40(x) DescriptorSet 1
                               Decorate 42(k) Flat
                               Decorate 42(k) Location 0
                               Decorate 42(k) DecorationAliasedPointerEXT
-                              Decorate 23(param) DecorationAliasedPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.bufferhandle4.frag.out b/Test/baseResults/spv.bufferhandle4.frag.out
index 1ccb6095..42b34b7e 100644
--- a/Test/baseResults/spv.bufferhandle4.frag.out
+++ b/Test/baseResults/spv.bufferhandle4.frag.out
@@ -28,21 +28,21 @@ spv.bufferhandle4.frag
                               MemberName 19(t5) 0  "m"
                               Name 21  "s5"
                               Name 43  "b"
+                              Decorate 8(t4) Block
                               MemberDecorate 8(t4) 0 Offset 0
                               MemberDecorate 8(t4) 1 Offset 8
-                              Decorate 8(t4) Block
+                              Decorate 10(t3) Block
                               MemberDecorate 10(t3) 0 Offset 0
                               MemberDecorate 10(t3) 1 Offset 8
-                              Decorate 10(t3) Block
+                              Decorate 11(t4) Block
                               MemberDecorate 11(t4) 0 Offset 0
                               MemberDecorate 11(t4) 1 Offset 8
-                              Decorate 11(t4) Block
-                              Decorate 13(x) DescriptorSet 1
                               Decorate 13(x) Binding 2
-                              MemberDecorate 19(t5) 0 Offset 0
+                              Decorate 13(x) DescriptorSet 1
                               Decorate 19(t5) Block
-                              Decorate 21(s5) DescriptorSet 0
+                              MemberDecorate 19(t5) 0 Offset 0
                               Decorate 21(s5) Binding 0
+                              Decorate 21(s5) DescriptorSet 0
                               Decorate 47 DecorationAliasedPointerEXT
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle5.frag.out b/Test/baseResults/spv.bufferhandle5.frag.out
index 0bcb34b0..cce131dd 100644
--- a/Test/baseResults/spv.bufferhandle5.frag.out
+++ b/Test/baseResults/spv.bufferhandle5.frag.out
@@ -19,13 +19,13 @@ spv.bufferhandle5.frag
                               Name 9  "t3"
                               MemberName 9(t3) 0  "h"
                               Name 11  "x"
+                              Decorate 8(t4) Block
                               MemberDecorate 8(t4) 0 Offset 0
                               MemberDecorate 8(t4) 1 Offset 8
-                              Decorate 8(t4) Block
-                              MemberDecorate 9(t3) 0 Offset 0
                               Decorate 9(t3) Block
-                              Decorate 11(x) DescriptorSet 1
+                              MemberDecorate 9(t3) 0 Offset 0
                               Decorate 11(x) Binding 2
+                              Decorate 11(x) DescriptorSet 1
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.bufferhandle6.frag.out b/Test/baseResults/spv.bufferhandle6.frag.out
index 758a30be..89749cd8 100644
--- a/Test/baseResults/spv.bufferhandle6.frag.out
+++ b/Test/baseResults/spv.bufferhandle6.frag.out
@@ -34,26 +34,26 @@ spv.bufferhandle6.frag
                               Name 154  "gl_FragCoord"
                               Decorate 12 ArrayStride 4
                               Decorate 14 ArrayStride 8
+                              Decorate 15(T1) Block
                               MemberDecorate 15(T1) 0 Offset 0
                               MemberDecorate 15(T1) 1 Offset 32
                               MemberDecorate 15(T1) 2 Offset 48
                               MemberDecorate 15(T1) 3 Offset 80
-                              Decorate 15(T1) Block
                               Decorate 16 ArrayStride 4
                               Decorate 17 ArrayStride 8
+                              Decorate 18(T1) Block
                               MemberDecorate 18(T1) 0 Offset 0
                               MemberDecorate 18(T1) 1 Offset 32
                               MemberDecorate 18(T1) 2 Offset 48
                               MemberDecorate 18(T1) 3 Offset 80
-                              Decorate 18(T1) Block
                               Decorate 19 ArrayStride 8
-                              Decorate 21(x) DescriptorSet 3
                               Decorate 21(x) Binding 1
+                              Decorate 21(x) DescriptorSet 3
                               Decorate 29 ArrayStride 4
-                              MemberDecorate 30(Block) 0 Offset 0
                               Decorate 30(Block) Block
-                              Decorate 149(image0_0) DescriptorSet 3
+                              MemberDecorate 30(Block) 0 Offset 0
                               Decorate 149(image0_0) Binding 0
+                              Decorate 149(image0_0) DescriptorSet 3
                               Decorate 154(gl_FragCoord) BuiltIn FragCoord
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.bufferhandle7.frag.out b/Test/baseResults/spv.bufferhandle7.frag.out
index 070adb71..6af3efbb 100644
--- a/Test/baseResults/spv.bufferhandle7.frag.out
+++ b/Test/baseResults/spv.bufferhandle7.frag.out
@@ -30,24 +30,24 @@ spv.bufferhandle7.frag
                               MemberName 15(t2) 0  "f"
                               MemberName 15(t2) 1  "g"
                               Name 17  "u"
+                              Decorate 7(t2) Block
                               MemberDecorate 7(t2) 0 Offset 0
                               MemberDecorate 7(t2) 1 Offset 8
-                              Decorate 7(t2) Block
+                              Decorate 9(blockType) Block
                               MemberDecorate 9(blockType) 0 Offset 0
                               MemberDecorate 9(blockType) 1 Offset 4
                               MemberDecorate 9(blockType) 2 Offset 8
                               MemberDecorate 9(blockType) 3 Offset 12
                               MemberDecorate 9(blockType) 4 Offset 16
-                              Decorate 9(blockType) Block
-                              Decorate 11(t) DescriptorSet 0
                               Decorate 11(t) Binding 0
-                              MemberDecorate 14(t3) 0 Offset 0
+                              Decorate 11(t) DescriptorSet 0
                               Decorate 14(t3) Block
+                              MemberDecorate 14(t3) 0 Offset 0
+                              Decorate 15(t2) Block
                               MemberDecorate 15(t2) 0 Offset 0
                               MemberDecorate 15(t2) 1 Offset 8
-                              Decorate 15(t2) Block
-                              Decorate 17(u) DescriptorSet 0
                               Decorate 17(u) Binding 1
+                              Decorate 17(u) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.bufferhandle8.frag.out b/Test/baseResults/spv.bufferhandle8.frag.out
index 52eec110..7a717b0b 100644
--- a/Test/baseResults/spv.bufferhandle8.frag.out
+++ b/Test/baseResults/spv.bufferhandle8.frag.out
@@ -38,29 +38,29 @@ spv.bufferhandle8.frag
                               MemberName 36(blockType) 3  "d"
                               MemberName 36(blockType) 4  "e"
                               Name 38  "t"
-                              MemberDecorate 10(T1) 0 Offset 0
                               Decorate 10(T1) Block
-                              MemberDecorate 11(T2) 0 Offset 0
+                              MemberDecorate 10(T1) 0 Offset 0
                               Decorate 11(T2) Block
+                              MemberDecorate 11(T2) 0 Offset 0
+                              Decorate 13(x) DecorationAliasedPointerEXT
                               MemberDecorate 14(Blah) 0 Offset 0
                               MemberDecorate 14(Blah) 1 Offset 8
                               Decorate 15 ArrayStride 16
-                              MemberDecorate 16(T3) 0 Offset 0
                               Decorate 16(T3) Block
-                              Decorate 18(t3) DescriptorSet 0
+                              MemberDecorate 16(T3) 0 Offset 0
                               Decorate 18(t3) Binding 0
+                              Decorate 18(t3) DescriptorSet 0
+                              Decorate 35(t2) Block
                               MemberDecorate 35(t2) 0 Offset 0
                               MemberDecorate 35(t2) 1 Offset 8
-                              Decorate 35(t2) Block
+                              Decorate 36(blockType) Block
                               MemberDecorate 36(blockType) 0 Offset 0
                               MemberDecorate 36(blockType) 1 Offset 4
                               MemberDecorate 36(blockType) 2 Offset 8
                               MemberDecorate 36(blockType) 3 Offset 12
                               MemberDecorate 36(blockType) 4 Offset 16
-                              Decorate 36(blockType) Block
-                              Decorate 38(t) DescriptorSet 0
                               Decorate 38(t) Binding 0
-                              Decorate 13(x) DecorationAliasedPointerEXT
+                              Decorate 38(t) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.bufferhandle9.frag.out b/Test/baseResults/spv.bufferhandle9.frag.out
index ff7ede7a..e094605c 100644
--- a/Test/baseResults/spv.bufferhandle9.frag.out
+++ b/Test/baseResults/spv.bufferhandle9.frag.out
@@ -32,12 +32,12 @@ spv.bufferhandle9.frag
                               MemberName 53(t2) 0  "f"
                               MemberName 53(t2) 1  "g"
                               Name 55  "t"
+                              Decorate 8(blockType) Block
                               MemberDecorate 8(blockType) 0 Offset 0
                               MemberDecorate 8(blockType) 1 Offset 4
                               MemberDecorate 8(blockType) 2 Offset 8
                               MemberDecorate 8(blockType) 3 Offset 12
                               MemberDecorate 8(blockType) 4 Offset 16
-                              Decorate 8(blockType) Block
                               Decorate 13(b1) DecorationAliasedPointerEXT
                               Decorate 16(h) Flat
                               Decorate 16(h) Location 0
@@ -45,11 +45,11 @@ spv.bufferhandle9.frag
                               Decorate 19(i) Location 1
                               Decorate 34(b2) DecorationAliasedPointerEXT
                               Decorate 37(b3) DecorationAliasedPointerEXT
+                              Decorate 53(t2) Block
                               MemberDecorate 53(t2) 0 Offset 0
                               MemberDecorate 53(t2) 1 Offset 8
-                              Decorate 53(t2) Block
-                              Decorate 55(t) DescriptorSet 0
                               Decorate 55(t) Binding 0
+                              Decorate 55(t) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.bufferhandleUvec2.frag.out b/Test/baseResults/spv.bufferhandleUvec2.frag.out
index 133190e5..0ee138ba 100644
--- a/Test/baseResults/spv.bufferhandleUvec2.frag.out
+++ b/Test/baseResults/spv.bufferhandleUvec2.frag.out
@@ -33,12 +33,12 @@ spv.bufferhandleUvec2.frag
                               MemberName 68(t2) 0  "f"
                               MemberName 68(t2) 1  "g"
                               Name 70  "t"
+                              Decorate 8(blockType) Block
                               MemberDecorate 8(blockType) 0 Offset 0
                               MemberDecorate 8(blockType) 1 Offset 4
                               MemberDecorate 8(blockType) 2 Offset 8
                               MemberDecorate 8(blockType) 3 Offset 12
                               MemberDecorate 8(blockType) 4 Offset 16
-                              Decorate 8(blockType) Block
                               Decorate 13(b1) DecorationAliasedPointerEXT
                               Decorate 16(h) Flat
                               Decorate 16(h) Location 0
@@ -46,11 +46,11 @@ spv.bufferhandleUvec2.frag
                               Decorate 19(i) Location 1
                               Decorate 34(b2) DecorationAliasedPointerEXT
                               Decorate 37(b3) DecorationAliasedPointerEXT
+                              Decorate 68(t2) Block
                               MemberDecorate 68(t2) 0 Offset 0
                               MemberDecorate 68(t2) 1 Offset 8
-                              Decorate 68(t2) Block
-                              Decorate 70(t) DescriptorSet 0
                               Decorate 70(t) Binding 0
+                              Decorate 70(t) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                               TypeForwardPointer 6 PhysicalStorageBufferEXT
diff --git a/Test/baseResults/spv.builtInXFB.vert.out b/Test/baseResults/spv.builtInXFB.vert.out
index b3a3e12c..68e5a7d4 100644
--- a/Test/baseResults/spv.builtInXFB.vert.out
+++ b/Test/baseResults/spv.builtInXFB.vert.out
@@ -15,11 +15,11 @@ spv.builtInXFB.vert
                               MemberName 8(gl_PerVertex) 0  "gl_Position"
                               MemberName 8(gl_PerVertex) 1  "gl_PointSize"
                               Name 10  ""
-                              MemberDecorate 8(gl_PerVertex) 0 Offset 20
-                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 8(gl_PerVertex) 1 Offset 16
-                              MemberDecorate 8(gl_PerVertex) 1 BuiltIn PointSize
                               Decorate 8(gl_PerVertex) Block
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 8(gl_PerVertex) 0 Offset 20
+                              MemberDecorate 8(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 8(gl_PerVertex) 1 Offset 16
                               Decorate 10 XfbBuffer 1
                               Decorate 10 XfbStride 64
                2:             TypeVoid
diff --git a/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out b/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out
index 5707fb93..1729a162 100644
--- a/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out
+++ b/Test/baseResults/spv.builtin.ShadingRateEXT.frag.out
@@ -19,8 +19,8 @@ WARNING: 0:5: '' : all default precisions are highp; use precision statements to
                               Name 8  "val"
                               Name 10  "gl_ShadingRateEXT"
                               Decorate 8(val) Location 0
-                              Decorate 10(gl_ShadingRateEXT) Flat
                               Decorate 10(gl_ShadingRateEXT) BuiltIn ShadingRateKHR
+                              Decorate 10(gl_ShadingRateEXT) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.computeShaderDerivatives.comp.out b/Test/baseResults/spv.computeShaderDerivatives.comp.out
index 47610785..789e05ea 100644
--- a/Test/baseResults/spv.computeShaderDerivatives.comp.out
+++ b/Test/baseResults/spv.computeShaderDerivatives.comp.out
@@ -61,6 +61,7 @@ spv.computeShaderDerivatives.comp
                               MemberName 10(block) 42  "v4X"
                               MemberName 10(block) 43  "v4Y"
                               Name 12  ""
+                              Decorate 10(block) BufferBlock
                               MemberDecorate 10(block) 0 Offset 0
                               MemberDecorate 10(block) 1 Offset 4
                               MemberDecorate 10(block) 2 Offset 8
@@ -105,9 +106,8 @@ spv.computeShaderDerivatives.comp
                               MemberDecorate 10(block) 41 Offset 448
                               MemberDecorate 10(block) 42 Offset 464
                               MemberDecorate 10(block) 43 Offset 480
-                              Decorate 10(block) BufferBlock
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 211 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.computeShaderDerivatives2.comp.out b/Test/baseResults/spv.computeShaderDerivatives2.comp.out
index 52b54746..a520fc3e 100644
--- a/Test/baseResults/spv.computeShaderDerivatives2.comp.out
+++ b/Test/baseResults/spv.computeShaderDerivatives2.comp.out
@@ -61,6 +61,7 @@ spv.computeShaderDerivatives2.comp
                               MemberName 10(block) 42  "v4X"
                               MemberName 10(block) 43  "v4Y"
                               Name 12  ""
+                              Decorate 10(block) BufferBlock
                               MemberDecorate 10(block) 0 Offset 0
                               MemberDecorate 10(block) 1 Offset 4
                               MemberDecorate 10(block) 2 Offset 8
@@ -105,9 +106,8 @@ spv.computeShaderDerivatives2.comp
                               MemberDecorate 10(block) 41 Offset 448
                               MemberDecorate 10(block) 42 Offset 464
                               MemberDecorate 10(block) 43 Offset 480
-                              Decorate 10(block) BufferBlock
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 211 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.conditionalDemote.frag.out b/Test/baseResults/spv.conditionalDemote.frag.out
index 84c816b2..fb789db7 100644
--- a/Test/baseResults/spv.conditionalDemote.frag.out
+++ b/Test/baseResults/spv.conditionalDemote.frag.out
@@ -18,8 +18,8 @@ spv.conditionalDemote.frag
                               Name 17  "coord"
                               Name 33  "x"
                               Name 36  "o"
-                              Decorate 13(tex) DescriptorSet 0
                               Decorate 13(tex) Binding 0
+                              Decorate 13(tex) DescriptorSet 0
                               Decorate 17(coord) Location 0
                               Decorate 36(o) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.conditionalDiscard.frag.out b/Test/baseResults/spv.conditionalDiscard.frag.out
index f31fa851..3d7cca84 100644
--- a/Test/baseResults/spv.conditionalDiscard.frag.out
+++ b/Test/baseResults/spv.conditionalDiscard.frag.out
@@ -14,8 +14,8 @@ spv.conditionalDiscard.frag
                               Name 13  "tex"
                               Name 17  "coord"
                               Name 34  "gl_FragColor"
-                              Decorate 13(tex) DescriptorSet 0
                               Decorate 13(tex) Binding 0
+                              Decorate 13(tex) DescriptorSet 0
                               Decorate 17(coord) Location 0
                               Decorate 34(gl_FragColor) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.constructComposite.comp.out b/Test/baseResults/spv.constructComposite.comp.out
index 491a33f1..c2688ca5 100644
--- a/Test/baseResults/spv.constructComposite.comp.out
+++ b/Test/baseResults/spv.constructComposite.comp.out
@@ -27,10 +27,10 @@ spv.constructComposite.comp
                               MemberDecorate 11(sA) 0 Offset 0
                               MemberDecorate 11(sA) 1 Offset 4
                               MemberDecorate 12(sB) 0 Offset 0
-                              MemberDecorate 13(ubo) 0 Offset 0
                               Decorate 13(ubo) Block
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13(ubo) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               Decorate 28 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.coopmat.comp.out b/Test/baseResults/spv.coopmat.comp.out
index b594af23..b14ad59b 100644
--- a/Test/baseResults/spv.coopmat.comp.out
+++ b/Test/baseResults/spv.coopmat.comp.out
@@ -78,24 +78,24 @@ spv.coopmat.comp
                               Name 227  "scm"
                               Decorate 66 ArrayStride 4
                               Decorate 67 ArrayStride 4
+                              Decorate 68(Block) Block
                               MemberDecorate 68(Block) 0 Offset 0
                               MemberDecorate 68(Block) 1 Offset 4194304
-                              Decorate 68(Block) Block
-                              Decorate 70(block) DescriptorSet 0
                               Decorate 70(block) Binding 0
+                              Decorate 70(block) DescriptorSet 0
                               Decorate 82 ArrayStride 2
                               Decorate 84 ArrayStride 2
+                              Decorate 86(Block16) Block
                               MemberDecorate 86(Block16) 0 Offset 0
                               MemberDecorate 86(Block16) 1 Offset 2097152
                               MemberDecorate 86(Block16) 2 Offset 2097160
-                              Decorate 86(Block16) Block
                               Decorate 87 ArrayStride 4
                               Decorate 88 ArrayStride 4
+                              Decorate 89(Block) Block
                               MemberDecorate 89(Block) 0 Offset 0
                               MemberDecorate 89(Block) 1 Offset 4194304
-                              Decorate 89(Block) Block
-                              Decorate 91(block16) DescriptorSet 0
                               Decorate 91(block16) Binding 0
+                              Decorate 91(block16) DescriptorSet 0
                               Decorate 124(Y) SpecId 0
                               Decorate 200 BuiltIn WorkgroupSize
                               Decorate 212(F) SpecId 1
diff --git a/Test/baseResults/spv.coopmatKHR.comp.out b/Test/baseResults/spv.coopmatKHR.comp.out
index 60a45400..4d87d70a 100644
--- a/Test/baseResults/spv.coopmatKHR.comp.out
+++ b/Test/baseResults/spv.coopmatKHR.comp.out
@@ -82,24 +82,24 @@ spv.coopmatKHR.comp
                               Name 249  "scm"
                               Decorate 67 ArrayStride 4
                               Decorate 68 ArrayStride 4
+                              Decorate 69(Block) Block
                               MemberDecorate 69(Block) 0 Offset 0
                               MemberDecorate 69(Block) 1 Offset 4194304
-                              Decorate 69(Block) Block
-                              Decorate 71(block) DescriptorSet 0
                               Decorate 71(block) Binding 0
+                              Decorate 71(block) DescriptorSet 0
                               Decorate 81 ArrayStride 2
                               Decorate 83 ArrayStride 2
+                              Decorate 85(Block16) Block
                               MemberDecorate 85(Block16) 0 Offset 0
                               MemberDecorate 85(Block16) 1 Offset 2097152
                               MemberDecorate 85(Block16) 2 Offset 2097160
-                              Decorate 85(Block16) Block
                               Decorate 86 ArrayStride 4
                               Decorate 87 ArrayStride 4
+                              Decorate 88(Block) Block
                               MemberDecorate 88(Block) 0 Offset 0
                               MemberDecorate 88(Block) 1 Offset 4194304
-                              Decorate 88(Block) Block
-                              Decorate 90(block16) DescriptorSet 0
                               Decorate 90(block16) Binding 0
+                              Decorate 90(block16) DescriptorSet 0
                               Decorate 128(Y) SpecId 0
                               Decorate 232 BuiltIn WorkgroupSize
                               Decorate 234(F) SpecId 1
diff --git a/Test/baseResults/spv.coopmat_armlayout.comp.out b/Test/baseResults/spv.coopmat_armlayout.comp.out
index fbeb6555..8566f6ec 100644
--- a/Test/baseResults/spv.coopmat_armlayout.comp.out
+++ b/Test/baseResults/spv.coopmat_armlayout.comp.out
@@ -84,24 +84,24 @@ spv.coopmat_armlayout.comp
                               Name 250  "scm"
                               Decorate 67 ArrayStride 4
                               Decorate 68 ArrayStride 4
+                              Decorate 69(Block) Block
                               MemberDecorate 69(Block) 0 Offset 0
                               MemberDecorate 69(Block) 1 Offset 4194304
-                              Decorate 69(Block) Block
-                              Decorate 71(block) DescriptorSet 0
                               Decorate 71(block) Binding 0
+                              Decorate 71(block) DescriptorSet 0
                               Decorate 82 ArrayStride 2
                               Decorate 84 ArrayStride 2
+                              Decorate 86(Block16) Block
                               MemberDecorate 86(Block16) 0 Offset 0
                               MemberDecorate 86(Block16) 1 Offset 2097152
                               MemberDecorate 86(Block16) 2 Offset 2097160
-                              Decorate 86(Block16) Block
                               Decorate 87 ArrayStride 4
                               Decorate 88 ArrayStride 4
+                              Decorate 89(Block) Block
                               MemberDecorate 89(Block) 0 Offset 0
                               MemberDecorate 89(Block) 1 Offset 4194304
-                              Decorate 89(Block) Block
-                              Decorate 91(block16) DescriptorSet 0
                               Decorate 91(block16) Binding 0
+                              Decorate 91(block16) DescriptorSet 0
                               Decorate 129(Y) SpecId 0
                               Decorate 233 BuiltIn WorkgroupSize
                               Decorate 235(F) SpecId 1
diff --git a/Test/baseResults/spv.dataOutIndirect.frag.out b/Test/baseResults/spv.dataOutIndirect.frag.out
index d07cfe97..e699d401 100644
--- a/Test/baseResults/spv.dataOutIndirect.frag.out
+++ b/Test/baseResults/spv.dataOutIndirect.frag.out
@@ -16,10 +16,10 @@ spv.dataOutIndirect.frag
                               Name 16  "bName"
                               Name 22  "Color"
                               Decorate 12(fcolor) Location 0
-                              MemberDecorate 14(b) 0 Offset 0
                               Decorate 14(b) Block
-                              Decorate 16(bName) DescriptorSet 0
+                              MemberDecorate 14(b) 0 Offset 0
                               Decorate 16(bName) Binding 0
+                              Decorate 16(bName) DescriptorSet 0
                               Decorate 22(Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.debugInfo.1.1.frag.out b/Test/baseResults/spv.debugInfo.1.1.frag.out
index 12726756..77fae611 100644
--- a/Test/baseResults/spv.debugInfo.1.1.frag.out
+++ b/Test/baseResults/spv.debugInfo.1.1.frag.out
@@ -129,12 +129,12 @@ void main()
                               Decorate 30(inv) Location 0
                               Decorate 104(outv) Location 0
                               MemberDecorate 105(S) 0 Offset 0
-                              MemberDecorate 106(ubuf) 0 Offset 0
                               Decorate 106(ubuf) Block
-                              Decorate 108 DescriptorSet 3
+                              MemberDecorate 106(ubuf) 0 Offset 0
                               Decorate 108 Binding 0
-                              Decorate 131(s2d) DescriptorSet 3
+                              Decorate 108 DescriptorSet 3
                               Decorate 131(s2d) Binding 1
+                              Decorate 131(s2d) DescriptorSet 3
                3:             TypeVoid
                4:             TypeFunction 3
                7:             TypeInt 32 1
diff --git a/Test/baseResults/spv.debugInfo.frag.out b/Test/baseResults/spv.debugInfo.frag.out
index 8bacd74d..2595211f 100644
--- a/Test/baseResults/spv.debugInfo.frag.out
+++ b/Test/baseResults/spv.debugInfo.frag.out
@@ -129,13 +129,13 @@ void main()
                               Decorate 30(inv) Location 0
                               Decorate 104(outv) Location 0
                               MemberDecorate 105(S) 0 Offset 0
-                              MemberDecorate 106(ubuf) 0 Offset 0
                               Decorate 106(ubuf) Block
-                              Decorate 108 DescriptorSet 3
+                              MemberDecorate 106(ubuf) 0 Offset 0
                               Decorate 108 Binding 0
+                              Decorate 108 DescriptorSet 3
                               Decorate 131(s2d) Location 0
-                              Decorate 131(s2d) DescriptorSet 3
                               Decorate 131(s2d) Binding 1
+                              Decorate 131(s2d) DescriptorSet 3
                3:             TypeVoid
                4:             TypeFunction 3
                7:             TypeInt 32 1
diff --git a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
index c47f0e66..9f94aa1d 100644
--- a/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.bufferref.glsl.frag.out
@@ -81,19 +81,19 @@ void main() {
                               Name 98  "vertex_pos0"
                               Name 135  "out_fragColor"
                               Decorate 42 ArrayStride 4
-                              MemberDecorate 44(MeshVertexPositions) 0 Offset 0
                               Decorate 44(MeshVertexPositions) Block
+                              MemberDecorate 44(MeshVertexPositions) 0 Offset 0
+                              Decorate 53(meshData) DecorationAliasedPointerEXT
                               MemberDecorate 59(Mesh) 0 Offset 0
                               Decorate 62 ArrayStride 8
+                              Decorate 64(PerPass_meshes) Block
                               MemberDecorate 64(PerPass_meshes) 0 NonWritable
                               MemberDecorate 64(PerPass_meshes) 0 Offset 0
-                              Decorate 64(PerPass_meshes) Block
-                              Decorate 73(perPass_meshes) DescriptorSet 0
                               Decorate 73(perPass_meshes) Binding 0
+                              Decorate 73(perPass_meshes) DescriptorSet 0
                               Decorate 82(tri_idx0) Flat
                               Decorate 82(tri_idx0) Location 0
                               Decorate 135(out_fragColor) Location 0
-                              Decorate 53(meshData) DecorationAliasedPointerEXT
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
diff --git a/Test/baseResults/spv.debuginfo.glsl.comp.out b/Test/baseResults/spv.debuginfo.glsl.comp.out
index 3ad62497..2a3505fb 100644
--- a/Test/baseResults/spv.debuginfo.glsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.glsl.comp.out
@@ -304,6 +304,7 @@ void main()
                               Name 719  "a"
                               Name 733  "b"
                               Name 750  "c"
+                              Decorate 78(UBO) Block
                               MemberDecorate 78(UBO) 0 Offset 0
                               MemberDecorate 78(UBO) 1 Offset 4
                               MemberDecorate 78(UBO) 2 Offset 8
@@ -315,9 +316,8 @@ void main()
                               MemberDecorate 78(UBO) 8 Offset 32
                               MemberDecorate 78(UBO) 9 Offset 48
                               MemberDecorate 78(UBO) 10 Offset 64
-                              Decorate 78(UBO) Block
-                              Decorate 101(params) DescriptorSet 0
                               Decorate 101(params) Binding 2
+                              Decorate 101(params) DescriptorSet 0
                               Decorate 133(gl_GlobalInvocationID) BuiltIn GlobalInvocationId
                               MemberDecorate 177(Particle) 0 Offset 0
                               MemberDecorate 177(Particle) 1 Offset 16
@@ -325,17 +325,17 @@ void main()
                               MemberDecorate 177(Particle) 3 Offset 48
                               MemberDecorate 177(Particle) 4 Offset 64
                               Decorate 189 ArrayStride 80
-                              MemberDecorate 191(ParticleIn) 0 Offset 0
                               Decorate 191(ParticleIn) BufferBlock
-                              Decorate 200 DescriptorSet 0
+                              MemberDecorate 191(ParticleIn) 0 Offset 0
                               Decorate 200 Binding 0
+                              Decorate 200 DescriptorSet 0
                               Decorate 214 ArrayStride 80
-                              MemberDecorate 216(ParticleOut) 0 Offset 0
                               Decorate 216(ParticleOut) BufferBlock
-                              Decorate 225 DescriptorSet 0
+                              MemberDecorate 216(ParticleOut) 0 Offset 0
                               Decorate 225 Binding 1
-                              MemberDecorate 675(PushConsts) 0 Offset 0
+                              Decorate 225 DescriptorSet 0
                               Decorate 675(PushConsts) Block
+                              MemberDecorate 675(PushConsts) 0 Offset 0
                               Decorate 974 BuiltIn WorkgroupSize
                4:             TypeVoid
                5:             TypeFunction 4
diff --git a/Test/baseResults/spv.debuginfo.glsl.frag.out b/Test/baseResults/spv.debuginfo.glsl.frag.out
index 6c5e4da6..b2370599 100644
--- a/Test/baseResults/spv.debuginfo.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.glsl.frag.out
@@ -352,29 +352,29 @@ void main()
                               Name 814  "spec"
                               Name 861  "param"
                               Name 866  "param"
-                              Decorate 177(samplerShadowMap) DescriptorSet 0
                               Decorate 177(samplerShadowMap) Binding 5
+                              Decorate 177(samplerShadowMap) DescriptorSet 0
                               MemberDecorate 405(Light) 0 Offset 0
                               MemberDecorate 405(Light) 1 Offset 16
                               MemberDecorate 405(Light) 2 Offset 32
                               MemberDecorate 405(Light) 3 ColMajor
-                              MemberDecorate 405(Light) 3 Offset 48
                               MemberDecorate 405(Light) 3 MatrixStride 16
+                              MemberDecorate 405(Light) 3 Offset 48
                               Decorate 416 ArrayStride 112
+                              Decorate 418(UBO) Block
                               MemberDecorate 418(UBO) 0 Offset 0
                               MemberDecorate 418(UBO) 1 Offset 16
                               MemberDecorate 418(UBO) 2 Offset 352
                               MemberDecorate 418(UBO) 3 Offset 356
-                              Decorate 418(UBO) Block
-                              Decorate 431(ubo) DescriptorSet 0
                               Decorate 431(ubo) Binding 4
-                              Decorate 487(samplerposition) DescriptorSet 0
+                              Decorate 431(ubo) DescriptorSet 0
                               Decorate 487(samplerposition) Binding 1
+                              Decorate 487(samplerposition) DescriptorSet 0
                               Decorate 493(inUV) Location 0
-                              Decorate 505(samplerNormal) DescriptorSet 0
                               Decorate 505(samplerNormal) Binding 2
-                              Decorate 518(samplerAlbedo) DescriptorSet 0
+                              Decorate 505(samplerNormal) DescriptorSet 0
                               Decorate 518(samplerAlbedo) Binding 3
+                              Decorate 518(samplerAlbedo) DescriptorSet 0
                               Decorate 546(outFragColor) Location 0
                4:             TypeVoid
                5:             TypeFunction 4
diff --git a/Test/baseResults/spv.debuginfo.glsl.geom.out b/Test/baseResults/spv.debuginfo.glsl.geom.out
index 32634ffe..0a92146a 100644
--- a/Test/baseResults/spv.debuginfo.glsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.glsl.geom.out
@@ -158,32 +158,32 @@ void main(void)
                               Decorate 64(outNormal) Location 0
                               Decorate 74 ArrayStride 64
                               Decorate 76 ArrayStride 64
-                              MemberDecorate 78(UBO) 0 ColMajor
-                              MemberDecorate 78(UBO) 0 Offset 0
-                              MemberDecorate 78(UBO) 0 MatrixStride 16
-                              MemberDecorate 78(UBO) 1 ColMajor
-                              MemberDecorate 78(UBO) 1 Offset 128
-                              MemberDecorate 78(UBO) 1 MatrixStride 16
-                              MemberDecorate 78(UBO) 2 Offset 256
                               Decorate 78(UBO) Block
-                              Decorate 92(ubo) DescriptorSet 0
+                              MemberDecorate 78(UBO) 0 ColMajor
+                              MemberDecorate 78(UBO) 0 MatrixStride 16
+                              MemberDecorate 78(UBO) 0 Offset 0
+                              MemberDecorate 78(UBO) 1 ColMajor
+                              MemberDecorate 78(UBO) 1 MatrixStride 16
+                              MemberDecorate 78(UBO) 1 Offset 128
+                              MemberDecorate 78(UBO) 2 Offset 256
                               Decorate 92(ubo) Binding 0
+                              Decorate 92(ubo) DescriptorSet 0
                               Decorate 98(gl_InvocationID) BuiltIn InvocationId
                               Decorate 121(inNormal) Location 0
                               Decorate 130(outColor) Location 1
                               Decorate 134(inColor) Location 1
+                              Decorate 151(gl_PerVertex) Block
                               MemberDecorate 151(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 151(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 151(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 151(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 151(gl_PerVertex) Block
                               Decorate 208(outLightVec) Location 3
                               Decorate 217(outViewVec) Location 2
+                              Decorate 225(gl_PerVertex) Block
                               MemberDecorate 225(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 225(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 225(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 225(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 225(gl_PerVertex) Block
                               Decorate 250(gl_ViewportIndex) BuiltIn ViewportIndex
                               Decorate 256(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 260(gl_PrimitiveIDIn) BuiltIn PrimitiveId
diff --git a/Test/baseResults/spv.debuginfo.glsl.tesc.out b/Test/baseResults/spv.debuginfo.glsl.tesc.out
index 8a0308a4..9a6a3c66 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tesc.out
@@ -251,39 +251,39 @@ void main()
                               Name 542  "inNormal"
                               Name 557  "outUV"
                               Decorate 95 ArrayStride 16
+                              Decorate 99(UBO) Block
                               MemberDecorate 99(UBO) 0 ColMajor
-                              MemberDecorate 99(UBO) 0 Offset 0
                               MemberDecorate 99(UBO) 0 MatrixStride 16
+                              MemberDecorate 99(UBO) 0 Offset 0
                               MemberDecorate 99(UBO) 1 ColMajor
-                              MemberDecorate 99(UBO) 1 Offset 64
                               MemberDecorate 99(UBO) 1 MatrixStride 16
+                              MemberDecorate 99(UBO) 1 Offset 64
                               MemberDecorate 99(UBO) 2 Offset 128
                               MemberDecorate 99(UBO) 3 Offset 144
                               MemberDecorate 99(UBO) 4 Offset 240
                               MemberDecorate 99(UBO) 5 Offset 244
                               MemberDecorate 99(UBO) 6 Offset 248
                               MemberDecorate 99(UBO) 7 Offset 256
-                              Decorate 99(UBO) Block
-                              Decorate 122(ubo) DescriptorSet 0
                               Decorate 122(ubo) Binding 0
+                              Decorate 122(ubo) DescriptorSet 0
+                              Decorate 243(gl_PerVertex) Block
                               MemberDecorate 243(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 243(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 243(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 243(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 243(gl_PerVertex) Block
                               Decorate 265(gl_InvocationID) BuiltIn InvocationId
-                              Decorate 285(samplerHeight) DescriptorSet 0
                               Decorate 285(samplerHeight) Binding 1
+                              Decorate 285(samplerHeight) DescriptorSet 0
                               Decorate 294(inUV) Location 1
-                              Decorate 383(gl_TessLevelInner) Patch
                               Decorate 383(gl_TessLevelInner) BuiltIn TessLevelInner
-                              Decorate 399(gl_TessLevelOuter) Patch
+                              Decorate 383(gl_TessLevelInner) Patch
                               Decorate 399(gl_TessLevelOuter) BuiltIn TessLevelOuter
+                              Decorate 399(gl_TessLevelOuter) Patch
+                              Decorate 503(gl_PerVertex) Block
                               MemberDecorate 503(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 503(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 503(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 503(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 503(gl_PerVertex) Block
                               Decorate 532(outNormal) Location 0
                               Decorate 542(inNormal) Location 0
                               Decorate 557(outUV) Location 1
diff --git a/Test/baseResults/spv.debuginfo.glsl.tese.out b/Test/baseResults/spv.debuginfo.glsl.tese.out
index a5cb5029..6098b73e 100644
--- a/Test/baseResults/spv.debuginfo.glsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.glsl.tese.out
@@ -183,34 +183,34 @@ void main()
                               Decorate 93(outUV) Location 1
                               Decorate 116(inNormal) Location 0
                               Decorate 143(outNormal) Location 0
+                              Decorate 166(gl_PerVertex) Block
                               MemberDecorate 166(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 166(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 166(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 166(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 166(gl_PerVertex) Block
-                              Decorate 234(displacementMap) DescriptorSet 0
                               Decorate 234(displacementMap) Binding 1
+                              Decorate 234(displacementMap) DescriptorSet 0
                               Decorate 249 ArrayStride 16
+                              Decorate 251(UBO) Block
                               MemberDecorate 251(UBO) 0 ColMajor
-                              MemberDecorate 251(UBO) 0 Offset 0
                               MemberDecorate 251(UBO) 0 MatrixStride 16
+                              MemberDecorate 251(UBO) 0 Offset 0
                               MemberDecorate 251(UBO) 1 ColMajor
-                              MemberDecorate 251(UBO) 1 Offset 64
                               MemberDecorate 251(UBO) 1 MatrixStride 16
+                              MemberDecorate 251(UBO) 1 Offset 64
                               MemberDecorate 251(UBO) 2 Offset 128
                               MemberDecorate 251(UBO) 3 Offset 144
                               MemberDecorate 251(UBO) 4 Offset 240
                               MemberDecorate 251(UBO) 5 Offset 244
                               MemberDecorate 251(UBO) 6 Offset 248
                               MemberDecorate 251(UBO) 7 Offset 256
-                              Decorate 251(UBO) Block
-                              Decorate 273(ubo) DescriptorSet 0
                               Decorate 273(ubo) Binding 0
+                              Decorate 273(ubo) DescriptorSet 0
+                              Decorate 288(gl_PerVertex) Block
                               MemberDecorate 288(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 288(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 288(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 288(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 288(gl_PerVertex) Block
                               Decorate 316(outViewVec) Location 2
                               Decorate 324(outLightVec) Location 3
                               Decorate 337(outWorldPos) Location 5
diff --git a/Test/baseResults/spv.debuginfo.glsl.vert.out b/Test/baseResults/spv.debuginfo.glsl.vert.out
index e635c5ef..f9838611 100644
--- a/Test/baseResults/spv.debuginfo.glsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.glsl.vert.out
@@ -204,26 +204,26 @@ void main()
                               Decorate 55(inUV) Location 2
                               Decorate 65(instanceTexIndex) Location 7
                               Decorate 83(instanceRot) Location 5
+                              Decorate 98(UBO) Block
                               MemberDecorate 98(UBO) 0 ColMajor
-                              MemberDecorate 98(UBO) 0 Offset 0
                               MemberDecorate 98(UBO) 0 MatrixStride 16
+                              MemberDecorate 98(UBO) 0 Offset 0
                               MemberDecorate 98(UBO) 1 ColMajor
-                              MemberDecorate 98(UBO) 1 Offset 64
                               MemberDecorate 98(UBO) 1 MatrixStride 16
+                              MemberDecorate 98(UBO) 1 Offset 64
                               MemberDecorate 98(UBO) 2 Offset 128
                               MemberDecorate 98(UBO) 3 Offset 144
                               MemberDecorate 98(UBO) 4 Offset 148
-                              Decorate 98(UBO) Block
-                              Decorate 114(ubo) DescriptorSet 0
                               Decorate 114(ubo) Binding 0
+                              Decorate 114(ubo) DescriptorSet 0
                               Decorate 305(inPos) Location 0
                               Decorate 323(instanceScale) Location 6
                               Decorate 328(instancePos) Location 4
+                              Decorate 339(gl_PerVertex) Block
                               MemberDecorate 339(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 339(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 339(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 339(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 339(gl_PerVertex) Block
                               Decorate 371(outNormal) Location 0
                               Decorate 390(inNormal) Location 1
                               Decorate 428(outLightVec) Location 4
diff --git a/Test/baseResults/spv.debuginfo.hlsl.comp.out b/Test/baseResults/spv.debuginfo.hlsl.comp.out
index e231ed3e..72f83ed7 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.comp.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.comp.out
@@ -144,31 +144,31 @@ spv.debuginfo.hlsl.comp
                               MemberDecorate 91(UBO) 8 Offset 32
                               MemberDecorate 91(UBO) 9 Offset 48
                               MemberDecorate 91(UBO) 10 Offset 64
-                              MemberDecorate 113(ubo) 0 Offset 0
                               Decorate 113(ubo) Block
-                              Decorate 122 DescriptorSet 0
+                              MemberDecorate 113(ubo) 0 Offset 0
                               Decorate 122 Binding 2
+                              Decorate 122 DescriptorSet 0
                               MemberDecorate 182(Particle) 0 Offset 0
                               MemberDecorate 182(Particle) 1 Offset 16
                               MemberDecorate 182(Particle) 2 Offset 32
                               MemberDecorate 182(Particle) 3 Offset 48
                               MemberDecorate 182(Particle) 4 Offset 64
                               Decorate 197 ArrayStride 80
+                              Decorate 199(particleIn) BufferBlock
                               MemberDecorate 199(particleIn) 0 NonWritable
                               MemberDecorate 199(particleIn) 0 Offset 0
-                              Decorate 199(particleIn) BufferBlock
-                              Decorate 208(particleIn) DescriptorSet 0
                               Decorate 208(particleIn) Binding 0
+                              Decorate 208(particleIn) DescriptorSet 0
                               Decorate 220 ArrayStride 80
-                              MemberDecorate 222(particleOut) 0 Offset 0
                               Decorate 222(particleOut) BufferBlock
-                              Decorate 230(particleOut) DescriptorSet 0
+                              MemberDecorate 222(particleOut) 0 Offset 0
                               Decorate 230(particleOut) Binding 1
+                              Decorate 230(particleOut) DescriptorSet 0
                               MemberDecorate 660(PushConstants) 0 Offset 0
-                              MemberDecorate 668($Global) 0 Offset 0
                               Decorate 668($Global) Block
-                              Decorate 676 DescriptorSet 0
+                              MemberDecorate 668($Global) 0 Offset 0
                               Decorate 676 Binding 3
+                              Decorate 676 DescriptorSet 0
                               Decorate 965(id) BuiltIn GlobalInvocationId
                4:             TypeVoid
                5:             TypeFunction 4
diff --git a/Test/baseResults/spv.debuginfo.hlsl.frag.out b/Test/baseResults/spv.debuginfo.hlsl.frag.out
index 29ebf408..0831b73c 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.frag.out
@@ -176,37 +176,37 @@ spv.debuginfo.hlsl.frag
                               Name 896  "inUV"
                               Name 899  "@entryPointOutput"
                               Name 900  "param"
-                              Decorate 164(textureShadowMap) DescriptorSet 0
                               Decorate 164(textureShadowMap) Binding 5
-                              Decorate 175(samplerShadowMap) DescriptorSet 0
+                              Decorate 164(textureShadowMap) DescriptorSet 0
                               Decorate 175(samplerShadowMap) Binding 5
+                              Decorate 175(samplerShadowMap) DescriptorSet 0
                               MemberDecorate 440(Light) 0 Offset 0
                               MemberDecorate 440(Light) 1 Offset 16
                               MemberDecorate 440(Light) 2 Offset 32
                               MemberDecorate 440(Light) 3 RowMajor
-                              MemberDecorate 440(Light) 3 Offset 48
                               MemberDecorate 440(Light) 3 MatrixStride 16
+                              MemberDecorate 440(Light) 3 Offset 48
                               Decorate 453 ArrayStride 112
                               MemberDecorate 455(UBO) 0 Offset 0
                               MemberDecorate 455(UBO) 1 Offset 16
                               MemberDecorate 455(UBO) 2 Offset 352
                               MemberDecorate 455(UBO) 3 Offset 356
-                              MemberDecorate 467(ubo) 0 Offset 0
                               Decorate 467(ubo) Block
-                              Decorate 475 DescriptorSet 0
+                              MemberDecorate 467(ubo) 0 Offset 0
                               Decorate 475 Binding 4
-                              Decorate 521(textureposition) DescriptorSet 0
+                              Decorate 475 DescriptorSet 0
                               Decorate 521(textureposition) Binding 1
-                              Decorate 526(samplerposition) DescriptorSet 0
+                              Decorate 521(textureposition) DescriptorSet 0
                               Decorate 526(samplerposition) Binding 1
-                              Decorate 542(textureNormal) DescriptorSet 0
+                              Decorate 526(samplerposition) DescriptorSet 0
                               Decorate 542(textureNormal) Binding 2
-                              Decorate 547(samplerNormal) DescriptorSet 0
+                              Decorate 542(textureNormal) DescriptorSet 0
                               Decorate 547(samplerNormal) Binding 2
-                              Decorate 561(textureAlbedo) DescriptorSet 0
+                              Decorate 547(samplerNormal) DescriptorSet 0
                               Decorate 561(textureAlbedo) Binding 3
-                              Decorate 566(samplerAlbedo) DescriptorSet 0
+                              Decorate 561(textureAlbedo) DescriptorSet 0
                               Decorate 566(samplerAlbedo) Binding 3
+                              Decorate 566(samplerAlbedo) DescriptorSet 0
                               Decorate 896(inUV) Location 0
                               Decorate 899(@entryPointOutput) Location 0
                4:             TypeVoid
diff --git a/Test/baseResults/spv.debuginfo.hlsl.geom.out b/Test/baseResults/spv.debuginfo.hlsl.geom.out
index 1ba94470..063a6d55 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.geom.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.geom.out
@@ -108,16 +108,16 @@ spv.debuginfo.hlsl.geom
                               Decorate 141 ArrayStride 64
                               Decorate 143 ArrayStride 64
                               MemberDecorate 145(UBO) 0 RowMajor
-                              MemberDecorate 145(UBO) 0 Offset 0
                               MemberDecorate 145(UBO) 0 MatrixStride 16
+                              MemberDecorate 145(UBO) 0 Offset 0
                               MemberDecorate 145(UBO) 1 RowMajor
-                              MemberDecorate 145(UBO) 1 Offset 128
                               MemberDecorate 145(UBO) 1 MatrixStride 16
+                              MemberDecorate 145(UBO) 1 Offset 128
                               MemberDecorate 145(UBO) 2 Offset 256
-                              MemberDecorate 160(ubo) 0 Offset 0
                               Decorate 160(ubo) Block
-                              Decorate 167 DescriptorSet 0
+                              MemberDecorate 160(ubo) 0 Offset 0
                               Decorate 167 Binding 0
+                              Decorate 167 DescriptorSet 0
                               Decorate 264(outStream.Pos) BuiltIn Position
                               Decorate 273(outStream.ViewportIndex) BuiltIn ViewportIndex
                               Decorate 278(outStream.PrimitiveID) BuiltIn PrimitiveId
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tesc.out b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
index 14f1e4b2..2bccaa87 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tesc.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tesc.out
@@ -143,25 +143,25 @@ WARNING: 0:158: '' : attribute does not apply to entry point
                               Name 698  "@patchConstantOutput.TessLevelInner"
                               Decorate 178 ArrayStride 16
                               MemberDecorate 180(UBO) 0 RowMajor
-                              MemberDecorate 180(UBO) 0 Offset 0
                               MemberDecorate 180(UBO) 0 MatrixStride 16
+                              MemberDecorate 180(UBO) 0 Offset 0
                               MemberDecorate 180(UBO) 1 RowMajor
-                              MemberDecorate 180(UBO) 1 Offset 64
                               MemberDecorate 180(UBO) 1 MatrixStride 16
+                              MemberDecorate 180(UBO) 1 Offset 64
                               MemberDecorate 180(UBO) 2 Offset 128
                               MemberDecorate 180(UBO) 3 Offset 144
                               MemberDecorate 180(UBO) 4 Offset 240
                               MemberDecorate 180(UBO) 5 Offset 244
                               MemberDecorate 180(UBO) 6 Offset 248
                               MemberDecorate 180(UBO) 7 Offset 256
-                              MemberDecorate 203(ubo) 0 Offset 0
                               Decorate 203(ubo) Block
-                              Decorate 210 DescriptorSet 0
+                              MemberDecorate 203(ubo) 0 Offset 0
                               Decorate 210 Binding 0
-                              Decorate 334(textureHeight) DescriptorSet 0
+                              Decorate 210 DescriptorSet 0
                               Decorate 334(textureHeight) Binding 1
-                              Decorate 345(samplerHeight) DescriptorSet 0
+                              Decorate 334(textureHeight) DescriptorSet 0
                               Decorate 345(samplerHeight) Binding 1
+                              Decorate 345(samplerHeight) DescriptorSet 0
                               Decorate 597(patch.Pos) BuiltIn Position
                               Decorate 604(patch.Normal) Location 0
                               Decorate 611(patch.UV) Location 1
@@ -169,10 +169,10 @@ WARNING: 0:158: '' : attribute does not apply to entry point
                               Decorate 654(@entryPointOutput.Pos) BuiltIn Position
                               Decorate 661(@entryPointOutput.Normal) Location 0
                               Decorate 668(@entryPointOutput.UV) Location 1
-                              Decorate 683(@patchConstantOutput.TessLevelOuter) Patch
                               Decorate 683(@patchConstantOutput.TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 698(@patchConstantOutput.TessLevelInner) Patch
+                              Decorate 683(@patchConstantOutput.TessLevelOuter) Patch
                               Decorate 698(@patchConstantOutput.TessLevelInner) BuiltIn TessLevelInner
+                              Decorate 698(@patchConstantOutput.TessLevelInner) Patch
                4:             TypeVoid
                5:             TypeFunction 4
                8:             TypeFloat 32
diff --git a/Test/baseResults/spv.debuginfo.hlsl.tese.out b/Test/baseResults/spv.debuginfo.hlsl.tese.out
index 774bf198..53704c1f 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.tese.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.tese.out
@@ -121,33 +121,33 @@ spv.debuginfo.hlsl.tese
                               Name 468  "@entryPointOutput.LightVec"
                               Name 471  "@entryPointOutput.EyePos"
                               Name 474  "@entryPointOutput.WorldPos"
-                              Decorate 241(displacementMapTexture) DescriptorSet 0
                               Decorate 241(displacementMapTexture) Binding 1
-                              Decorate 253(displacementMapSampler) DescriptorSet 0
+                              Decorate 241(displacementMapTexture) DescriptorSet 0
                               Decorate 253(displacementMapSampler) Binding 1
+                              Decorate 253(displacementMapSampler) DescriptorSet 0
                               Decorate 272 ArrayStride 16
                               MemberDecorate 274(UBO) 0 RowMajor
-                              MemberDecorate 274(UBO) 0 Offset 0
                               MemberDecorate 274(UBO) 0 MatrixStride 16
+                              MemberDecorate 274(UBO) 0 Offset 0
                               MemberDecorate 274(UBO) 1 RowMajor
-                              MemberDecorate 274(UBO) 1 Offset 64
                               MemberDecorate 274(UBO) 1 MatrixStride 16
+                              MemberDecorate 274(UBO) 1 Offset 64
                               MemberDecorate 274(UBO) 2 Offset 128
                               MemberDecorate 274(UBO) 3 Offset 144
                               MemberDecorate 274(UBO) 4 Offset 240
                               MemberDecorate 274(UBO) 5 Offset 244
                               MemberDecorate 274(UBO) 6 Offset 248
                               MemberDecorate 274(UBO) 7 Offset 256
-                              MemberDecorate 297(ubo) 0 Offset 0
                               Decorate 297(ubo) Block
-                              Decorate 303 DescriptorSet 0
+                              MemberDecorate 297(ubo) 0 Offset 0
                               Decorate 303 Binding 0
-                              Decorate 368(input.TessLevelOuter) Patch
+                              Decorate 303 DescriptorSet 0
                               Decorate 368(input.TessLevelOuter) BuiltIn TessLevelOuter
-                              Decorate 383(input.TessLevelInner) Patch
+                              Decorate 368(input.TessLevelOuter) Patch
                               Decorate 383(input.TessLevelInner) BuiltIn TessLevelInner
-                              Decorate 392(TessCoord) Patch
+                              Decorate 383(input.TessLevelInner) Patch
                               Decorate 392(TessCoord) BuiltIn TessCoord
+                              Decorate 392(TessCoord) Patch
                               Decorate 401(patch.Pos) BuiltIn Position
                               Decorate 408(patch.Normal) Location 0
                               Decorate 414(patch.UV) Location 1
diff --git a/Test/baseResults/spv.debuginfo.hlsl.vert.out b/Test/baseResults/spv.debuginfo.hlsl.vert.out
index 55452392..d557c09c 100644
--- a/Test/baseResults/spv.debuginfo.hlsl.vert.out
+++ b/Test/baseResults/spv.debuginfo.hlsl.vert.out
@@ -106,18 +106,18 @@ spv.debuginfo.hlsl.vert
                               Name 506  "@entryPointOutput.ViewVec"
                               Name 509  "@entryPointOutput.LightVec"
                               MemberDecorate 143(UBO) 0 RowMajor
-                              MemberDecorate 143(UBO) 0 Offset 0
                               MemberDecorate 143(UBO) 0 MatrixStride 16
+                              MemberDecorate 143(UBO) 0 Offset 0
                               MemberDecorate 143(UBO) 1 RowMajor
-                              MemberDecorate 143(UBO) 1 Offset 64
                               MemberDecorate 143(UBO) 1 MatrixStride 16
+                              MemberDecorate 143(UBO) 1 Offset 64
                               MemberDecorate 143(UBO) 2 Offset 128
                               MemberDecorate 143(UBO) 3 Offset 144
                               MemberDecorate 143(UBO) 4 Offset 148
-                              MemberDecorate 159(ubo) 0 Offset 0
                               Decorate 159(ubo) Block
-                              Decorate 166 DescriptorSet 0
+                              MemberDecorate 159(ubo) 0 Offset 0
                               Decorate 166 Binding 0
+                              Decorate 166 DescriptorSet 0
                               Decorate 461(input.Pos) Location 0
                               Decorate 464(input.Normal) Location 1
                               Decorate 468(input.UV) Location 2
diff --git a/Test/baseResults/spv.debuginfo.include.glsl.frag.out b/Test/baseResults/spv.debuginfo.include.glsl.frag.out
index 22453950..02b893f2 100644
--- a/Test/baseResults/spv.debuginfo.include.glsl.frag.out
+++ b/Test/baseResults/spv.debuginfo.include.glsl.frag.out
@@ -67,10 +67,10 @@ vec4 headerFunction(vec4 a) {
                               Name 100  "param"
                               Name 107  "param"
                               Decorate 81(headerOut) Location 0
-                              MemberDecorate 85(UBO) 0 Offset 0
                               Decorate 85(UBO) Block
-                              Decorate 93 DescriptorSet 0
+                              MemberDecorate 85(UBO) 0 Offset 0
                               Decorate 93 Binding 0
+                              Decorate 93 DescriptorSet 0
                5:             TypeVoid
                6:             TypeFunction 5
                8:             TypeInt 32 0
diff --git a/Test/baseResults/spv.debuginfo.rt_types.glsl.rgen.out b/Test/baseResults/spv.debuginfo.rt_types.glsl.rgen.out
index 140c9b90..39814e85 100644
--- a/Test/baseResults/spv.debuginfo.rt_types.glsl.rgen.out
+++ b/Test/baseResults/spv.debuginfo.rt_types.glsl.rgen.out
@@ -73,11 +73,11 @@ void main()
                               MemberName 85(block) 0  "dir"
                               MemberName 85(block) 1  "origin"
                               Name 94  ""
-                              Decorate 76(acc0) DescriptorSet 0
                               Decorate 76(acc0) Binding 0
+                              Decorate 76(acc0) DescriptorSet 0
+                              Decorate 85(block) BufferBlock
                               MemberDecorate 85(block) 0 Offset 0
                               MemberDecorate 85(block) 1 Offset 16
-                              Decorate 85(block) BufferBlock
                4:             TypeVoid
                5:             TypeFunction 4
                7:             TypeInt 32 0
diff --git a/Test/baseResults/spv.deepRvalue.frag.out b/Test/baseResults/spv.deepRvalue.frag.out
index efb9d2ec..a278a9cf 100644
--- a/Test/baseResults/spv.deepRvalue.frag.out
+++ b/Test/baseResults/spv.deepRvalue.frag.out
@@ -27,8 +27,8 @@ spv.deepRvalue.frag
                               MemberName 131(str) 2  "c"
                               Name 133  "t"
                               Name 146  "gl_FragColor"
-                              Decorate 111(samp2D) DescriptorSet 0
                               Decorate 111(samp2D) Binding 0
+                              Decorate 111(samp2D) DescriptorSet 0
                               Decorate 146(gl_FragColor) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.deviceGroup.frag.out b/Test/baseResults/spv.deviceGroup.frag.out
index 68285a1b..7ffc1957 100644
--- a/Test/baseResults/spv.deviceGroup.frag.out
+++ b/Test/baseResults/spv.deviceGroup.frag.out
@@ -15,8 +15,8 @@ spv.deviceGroup.frag
                               Name 9  "color"
                               Name 12  "gl_DeviceIndex"
                               Decorate 9(color) Location 0
-                              Decorate 12(gl_DeviceIndex) Flat
                               Decorate 12(gl_DeviceIndex) BuiltIn DeviceIndex
+                              Decorate 12(gl_DeviceIndex) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.double.comp.out b/Test/baseResults/spv.double.comp.out
index 3a5eef8a..f7a4f811 100644
--- a/Test/baseResults/spv.double.comp.out
+++ b/Test/baseResults/spv.double.comp.out
@@ -22,16 +22,16 @@ spv.double.comp
                               Name 49  "aa"
                               Name 54  "globalCoef"
                               Name 59  "destTex"
+                              Decorate 8(bufName) BufferBlock
                               MemberDecorate 8(bufName) 0 Offset 0
                               MemberDecorate 8(bufName) 1 Offset 8
-                              Decorate 8(bufName) BufferBlock
-                              Decorate 10(bufInst) DescriptorSet 0
                               Decorate 10(bufInst) Binding 0
+                              Decorate 10(bufInst) DescriptorSet 0
                               Decorate 26(gl_GlobalInvocationID) BuiltIn GlobalInvocationId
                               Decorate 33(gl_LocalInvocationID) BuiltIn LocalInvocationId
-                              Decorate 59(destTex) DescriptorSet 0
-                              Decorate 59(destTex) Binding 0
                               Decorate 59(destTex) NonReadable
+                              Decorate 59(destTex) Binding 0
+                              Decorate 59(destTex) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.expect_assume.assumeEXT.comp.out b/Test/baseResults/spv.expect_assume.assumeEXT.comp.out
index 517103f0..b865bd83 100644
--- a/Test/baseResults/spv.expect_assume.assumeEXT.comp.out
+++ b/Test/baseResults/spv.expect_assume.assumeEXT.comp.out
@@ -16,11 +16,11 @@ spv.expect_assume.assumeEXT.comp
                               Name 7  "roblock"
                               MemberName 7(roblock) 0  "i"
                               Name 9  "ro"
+                              Decorate 7(roblock) BufferBlock
                               MemberDecorate 7(roblock) 0 NonWritable
                               MemberDecorate 7(roblock) 0 Offset 0
-                              Decorate 7(roblock) BufferBlock
-                              Decorate 9(ro) DescriptorSet 0
                               Decorate 9(ro) Binding 0
+                              Decorate 9(ro) DescriptorSet 0
                               Decorate 21 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.expect_assume.expectEXT.comp.out b/Test/baseResults/spv.expect_assume.expectEXT.comp.out
index ee4fdf61..8cc9f48e 100644
--- a/Test/baseResults/spv.expect_assume.expectEXT.comp.out
+++ b/Test/baseResults/spv.expect_assume.expectEXT.comp.out
@@ -28,6 +28,7 @@ spv.expect_assume.expectEXT.comp
                               MemberName 18(roblock) 10  "uv3"
                               MemberName 18(roblock) 11  "uv4"
                               Name 20  "ro"
+                              Decorate 18(roblock) BufferBlock
                               MemberDecorate 18(roblock) 0 NonWritable
                               MemberDecorate 18(roblock) 0 Offset 0
                               MemberDecorate 18(roblock) 1 NonWritable
@@ -52,9 +53,8 @@ spv.expect_assume.expectEXT.comp
                               MemberDecorate 18(roblock) 10 Offset 112
                               MemberDecorate 18(roblock) 11 NonWritable
                               MemberDecorate 18(roblock) 11 Offset 128
-                              Decorate 18(roblock) BufferBlock
-                              Decorate 20(ro) DescriptorSet 0
                               Decorate 20(ro) Binding 0
+                              Decorate 20(ro) DescriptorSet 0
                               Decorate 177 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.expect_assume.expectEXT.exttypes.comp.out b/Test/baseResults/spv.expect_assume.expectEXT.exttypes.comp.out
index 6647f0c6..d0f2632f 100644
--- a/Test/baseResults/spv.expect_assume.expectEXT.exttypes.comp.out
+++ b/Test/baseResults/spv.expect_assume.expectEXT.exttypes.comp.out
@@ -56,6 +56,7 @@ spv.expect_assume.expectEXT.exttypes.comp
                               MemberName 42(roblock) 30  "u64v3"
                               MemberName 42(roblock) 31  "u64v4"
                               Name 44  "ro"
+                              Decorate 42(roblock) BufferBlock
                               MemberDecorate 42(roblock) 0 NonWritable
                               MemberDecorate 42(roblock) 0 Offset 0
                               MemberDecorate 42(roblock) 1 NonWritable
@@ -120,9 +121,8 @@ spv.expect_assume.expectEXT.exttypes.comp
                               MemberDecorate 42(roblock) 30 Offset 320
                               MemberDecorate 42(roblock) 31 NonWritable
                               MemberDecorate 42(roblock) 31 Offset 352
-                              Decorate 42(roblock) BufferBlock
-                              Decorate 44(ro) DescriptorSet 0
                               Decorate 44(ro) Binding 0
+                              Decorate 44(ro) DescriptorSet 0
                               Decorate 457 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.explicittypes.frag.out b/Test/baseResults/spv.explicittypes.frag.out
index 3b334603..eec771a9 100644
--- a/Test/baseResults/spv.explicittypes.frag.out
+++ b/Test/baseResults/spv.explicittypes.frag.out
@@ -114,10 +114,11 @@ spv.explicittypes.frag
                               MemberName 564(Block) 14  "u32v3"
                               MemberName 564(Block) 15  "u32v4"
                               Name 566  "block"
-                              MemberDecorate 26(Uniforms) 0 Offset 0
                               Decorate 26(Uniforms) Block
-                              Decorate 28 DescriptorSet 0
+                              MemberDecorate 26(Uniforms) 0 Offset 0
                               Decorate 28 Binding 0
+                              Decorate 28 DescriptorSet 0
+                              Decorate 564(Block) Block
                               MemberDecorate 564(Block) 0 Offset 0
                               MemberDecorate 564(Block) 1 Offset 4
                               MemberDecorate 564(Block) 2 Offset 8
@@ -134,9 +135,8 @@ spv.explicittypes.frag
                               MemberDecorate 564(Block) 13 Offset 104
                               MemberDecorate 564(Block) 14 Offset 112
                               MemberDecorate 564(Block) 15 Offset 128
-                              Decorate 564(Block) Block
-                              Decorate 566(block) DescriptorSet 0
                               Decorate 566(block) Binding 1
+                              Decorate 566(block) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
               16:             TypeInt 64 1
diff --git a/Test/baseResults/spv.ext.AccelDecl.frag.out b/Test/baseResults/spv.ext.AccelDecl.frag.out
index e329ee92..9b418973 100644
--- a/Test/baseResults/spv.ext.AccelDecl.frag.out
+++ b/Test/baseResults/spv.ext.AccelDecl.frag.out
@@ -21,8 +21,8 @@ spv.ext.AccelDecl.frag
                               Name 9  "outColor"
                               Name 14  "topLevelAS"
                               Decorate 9(outColor) Location 0
-                              Decorate 14(topLevelAS) DescriptorSet 0
                               Decorate 14(topLevelAS) Binding 1
+                              Decorate 14(topLevelAS) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.ext.ClosestHitShader.rchit.out b/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
index 3c1883bc..3a47f1ea 100644
--- a/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
+++ b/Test/baseResults/spv.ext.ClosestHitShader.rchit.out
@@ -74,8 +74,8 @@ spv.ext.ClosestHitShader.rchit
                               Decorate 69(gl_GeometryIndexEXT) BuiltIn RayGeometryIndexKHR
                               Decorate 81(gl_CullMaskEXT) BuiltIn CullMaskKHR
                               Decorate 87(gl_HitTriangleVertexPositionsEXT) BuiltIn HitTriangleVertexPositionsKHR
-                              Decorate 93(accEXT) DescriptorSet 0
                               Decorate 93(accEXT) Binding 0
+                              Decorate 93(accEXT) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out b/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out
index d586ffb4..28a54700 100644
--- a/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out
+++ b/Test/baseResults/spv.ext.ClosestHitShader_Subgroup.rchit.out
@@ -32,8 +32,8 @@ spv.ext.ClosestHitShader_Subgroup.rchit
                               Name 48  "gl_SubgroupLeMask"
                               Name 53  "gl_SubGroupLtMaskARB"
                               Name 61  "gl_SMIDNV"
-                              Decorate 8(accEXT) DescriptorSet 0
                               Decorate 8(accEXT) Binding 0
+                              Decorate 8(accEXT) DescriptorSet 0
                               Decorate 28(gl_SubgroupInvocationID) RelaxedPrecision
                               Decorate 28(gl_SubgroupInvocationID) BuiltIn SubgroupLocalInvocationId
                               Decorate 29 RelaxedPrecision
diff --git a/Test/baseResults/spv.ext.MissShader.rmiss.out b/Test/baseResults/spv.ext.MissShader.rmiss.out
index 0f0f25a5..d03c5c38 100644
--- a/Test/baseResults/spv.ext.MissShader.rmiss.out
+++ b/Test/baseResults/spv.ext.MissShader.rmiss.out
@@ -57,8 +57,8 @@ spv.ext.MissShader.rmiss
                               Decorate 29(gl_RayTminEXT) BuiltIn RayTminKHR
                               Decorate 32(gl_RayTmaxEXT) BuiltIn RayTmaxKHR
                               Decorate 37(gl_CullMaskEXT) BuiltIn CullMaskKHR
-                              Decorate 41(accEXT) DescriptorSet 0
                               Decorate 41(accEXT) Binding 0
+                              Decorate 41(accEXT) DescriptorSet 0
                               Decorate 57(gl_SubGroupSizeARB) BuiltIn SubgroupSize
                               Decorate 57(gl_SubGroupSizeARB) Volatile
                               Decorate 57(gl_SubGroupSizeARB) Coherent
@@ -68,8 +68,8 @@ spv.ext.MissShader.rmiss
                               Decorate 67(gl_WarpIDNV) BuiltIn WarpIDNV
                               Decorate 67(gl_WarpIDNV) Volatile
                               Decorate 67(gl_WarpIDNV) Coherent
-                              Decorate 78(s2D) DescriptorSet 0
                               Decorate 78(s2D) Binding 1
+                              Decorate 78(s2D) DescriptorSet 0
                               Decorate 82(c2) Location 2
                               Decorate 87(lodClamp) Location 3
                2:             TypeVoid
diff --git a/Test/baseResults/spv.ext.RayConstants.rgen.out b/Test/baseResults/spv.ext.RayConstants.rgen.out
index 9cd294a9..05fb8f79 100644
--- a/Test/baseResults/spv.ext.RayConstants.rgen.out
+++ b/Test/baseResults/spv.ext.RayConstants.rgen.out
@@ -13,8 +13,8 @@ spv.ext.RayConstants.rgen
                               Name 4  "main"
                               Name 8  "accEXT"
                               Name 26  "payload"
-                              Decorate 8(accEXT) DescriptorSet 0
                               Decorate 8(accEXT) Binding 0
+                              Decorate 8(accEXT) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeAccelerationStructureKHR
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
index 31a8bda0..7fec5c39 100644
--- a/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
@@ -37,6 +37,7 @@ spv.ext.RayGenSBTlayout.rgen
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
                               Decorate 34 ArrayStride 8
                               Decorate 35 ArrayStride 16
+                              Decorate 36(block) Block
                               MemberDecorate 36(block) 0 Offset 0
                               MemberDecorate 36(block) 1 Offset 16
                               MemberDecorate 36(block) 2 Offset 28
@@ -48,7 +49,6 @@ spv.ext.RayGenSBTlayout.rgen
                               MemberDecorate 36(block) 8 Offset 112
                               MemberDecorate 36(block) 9 Offset 120
                               MemberDecorate 36(block) 10 Offset 128
-                              Decorate 36(block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
index f0302f74..714242b0 100644
--- a/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
@@ -37,6 +37,7 @@ spv.ext.RayGenSBTlayout140.rgen
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
                               Decorate 34 ArrayStride 16
                               Decorate 35 ArrayStride 16
+                              Decorate 36(block) Block
                               MemberDecorate 36(block) 0 Offset 0
                               MemberDecorate 36(block) 1 Offset 16
                               MemberDecorate 36(block) 2 Offset 28
@@ -48,7 +49,6 @@ spv.ext.RayGenSBTlayout140.rgen
                               MemberDecorate 36(block) 8 Offset 128
                               MemberDecorate 36(block) 9 Offset 136
                               MemberDecorate 36(block) 10 Offset 144
-                              Decorate 36(block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
index e83dd424..ab2b9963 100644
--- a/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
@@ -37,6 +37,7 @@ spv.ext.RayGenSBTlayout430.rgen
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
                               Decorate 34 ArrayStride 8
                               Decorate 35 ArrayStride 16
+                              Decorate 36(block) Block
                               MemberDecorate 36(block) 0 Offset 0
                               MemberDecorate 36(block) 1 Offset 16
                               MemberDecorate 36(block) 2 Offset 28
@@ -48,7 +49,6 @@ spv.ext.RayGenSBTlayout430.rgen
                               MemberDecorate 36(block) 8 Offset 112
                               MemberDecorate 36(block) 9 Offset 120
                               MemberDecorate 36(block) 10 Offset 128
-                              Decorate 36(block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out b/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
index a24b64c7..6f4b471d 100644
--- a/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
@@ -38,6 +38,7 @@ spv.ext.RayGenSBTlayoutscalar.rgen
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
                               Decorate 34 ArrayStride 8
                               Decorate 35 ArrayStride 12
+                              Decorate 36(block) Block
                               MemberDecorate 36(block) 0 Offset 0
                               MemberDecorate 36(block) 1 Offset 12
                               MemberDecorate 36(block) 2 Offset 24
@@ -49,7 +50,6 @@ spv.ext.RayGenSBTlayoutscalar.rgen
                               MemberDecorate 36(block) 8 Offset 92
                               MemberDecorate 36(block) 9 Offset 96
                               MemberDecorate 36(block) 10 Offset 104
-                              Decorate 36(block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenShader.rgen.out b/Test/baseResults/spv.ext.RayGenShader.rgen.out
index b872d9e0..37380e96 100644
--- a/Test/baseResults/spv.ext.RayGenShader.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShader.rgen.out
@@ -30,15 +30,15 @@ spv.ext.RayGenShader.rgen
                               Name 57  "imageu"
                               Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
-                              Decorate 29(accEXT0) DescriptorSet 0
                               Decorate 29(accEXT0) Binding 0
+                              Decorate 29(accEXT0) DescriptorSet 0
+                              Decorate 38(block) Block
                               MemberDecorate 38(block) 0 Offset 0
                               MemberDecorate 38(block) 1 Offset 16
-                              Decorate 38(block) Block
-                              Decorate 54(accEXT1) DescriptorSet 0
                               Decorate 54(accEXT1) Binding 1
-                              Decorate 57(imageu) DescriptorSet 0
+                              Decorate 54(accEXT1) DescriptorSet 0
                               Decorate 57(imageu) Binding 2
+                              Decorate 57(imageu) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenShader11.rgen.out b/Test/baseResults/spv.ext.RayGenShader11.rgen.out
index d79f4f37..b8d72563 100644
--- a/Test/baseResults/spv.ext.RayGenShader11.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShader11.rgen.out
@@ -25,11 +25,11 @@ spv.ext.RayGenShader11.rgen
                               Name 52  "payload"
                               Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
-                              Decorate 29(accEXT) DescriptorSet 0
                               Decorate 29(accEXT) Binding 0
+                              Decorate 29(accEXT) DescriptorSet 0
+                              Decorate 37(block) Block
                               MemberDecorate 37(block) 0 Offset 0
                               MemberDecorate 37(block) 1 Offset 16
-                              Decorate 37(block) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out b/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
index 7e351d75..ebe0d39a 100644
--- a/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
+++ b/Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
@@ -35,16 +35,16 @@ spv.ext.RayGenShaderArray.rgen
                               Name 65  "accEXT1"
                               Decorate 11(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
                               Decorate 21(gl_LaunchSizeEXT) BuiltIn LaunchSizeKHR
-                              Decorate 30(accEXT0) DescriptorSet 0
                               Decorate 30(accEXT0) Binding 0
+                              Decorate 30(accEXT0) DescriptorSet 0
+                              Decorate 36(block) Block
                               MemberDecorate 36(block) 0 Offset 0
                               MemberDecorate 36(block) 1 Offset 16
                               MemberDecorate 36(block) 2 Offset 28
                               MemberDecorate 36(block) 3 Offset 32
                               MemberDecorate 36(block) 4 Offset 40
-                              Decorate 36(block) Block
-                              Decorate 65(accEXT1) DescriptorSet 0
                               Decorate 65(accEXT1) Binding 1
+                              Decorate 65(accEXT1) DescriptorSet 0
                               Decorate 80 DecorationNonUniformEXT
                               Decorate 81 DecorationNonUniformEXT
                               Decorate 82 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.ext.World3x4.rahit.out b/Test/baseResults/spv.ext.World3x4.rahit.out
index 92ad18fb..3c63dd33 100644
--- a/Test/baseResults/spv.ext.World3x4.rahit.out
+++ b/Test/baseResults/spv.ext.World3x4.rahit.out
@@ -26,8 +26,8 @@ spv.ext.World3x4.rahit
                               Name 89  "hitValue"
                               Decorate 43(gl_LaunchIDEXT) BuiltIn LaunchIdKHR
                               Decorate 60(gl_WorldToObject3x4EXT) BuiltIn WorldToObjectKHR
-                              Decorate 78(result) DescriptorSet 0
                               Decorate 78(result) Binding 0
+                              Decorate 78(result) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.ext.meshShaderBuiltins.mesh.out b/Test/baseResults/spv.ext.meshShaderBuiltins.mesh.out
index a1d71a5b..7fac1a7e 100644
--- a/Test/baseResults/spv.ext.meshShaderBuiltins.mesh.out
+++ b/Test/baseResults/spv.ext.meshShaderBuiltins.mesh.out
@@ -50,20 +50,20 @@ spv.ext.meshShaderBuiltins.mesh
                               Decorate 13(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 19(gl_WorkGroupID) BuiltIn WorkgroupId
                               Decorate 24(gl_NumWorkGroups) BuiltIn NumWorkgroups
+                              Decorate 38(gl_MeshPerVertexEXT) Block
                               MemberDecorate 38(gl_MeshPerVertexEXT) 0 BuiltIn Position
                               MemberDecorate 38(gl_MeshPerVertexEXT) 1 BuiltIn PointSize
                               MemberDecorate 38(gl_MeshPerVertexEXT) 2 BuiltIn ClipDistance
                               MemberDecorate 38(gl_MeshPerVertexEXT) 3 BuiltIn CullDistance
-                              Decorate 38(gl_MeshPerVertexEXT) Block
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
                               Decorate 90(gl_MeshPerPrimitiveEXT) Block
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
                               Decorate 134(gl_PrimitiveTriangleIndicesEXT) BuiltIn PrimitiveTriangleIndicesEXT
                               Decorate 152(gl_DrawIDARB) BuiltIn DrawIndex
                               Decorate 155(gl_ViewIndex) BuiltIn ViewIndex
diff --git a/Test/baseResults/spv.ext.meshShaderBuiltinsShadingRate.mesh.out b/Test/baseResults/spv.ext.meshShaderBuiltinsShadingRate.mesh.out
index 65bd740d..fc14ff6c 100644
--- a/Test/baseResults/spv.ext.meshShaderBuiltinsShadingRate.mesh.out
+++ b/Test/baseResults/spv.ext.meshShaderBuiltinsShadingRate.mesh.out
@@ -54,22 +54,22 @@ spv.ext.meshShaderBuiltinsShadingRate.mesh
                               Decorate 13(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 19(gl_WorkGroupID) BuiltIn WorkgroupId
                               Decorate 24(gl_NumWorkGroups) BuiltIn NumWorkgroups
+                              Decorate 38(gl_MeshPerVertexEXT) Block
                               MemberDecorate 38(gl_MeshPerVertexEXT) 0 BuiltIn Position
                               MemberDecorate 38(gl_MeshPerVertexEXT) 1 BuiltIn PointSize
                               MemberDecorate 38(gl_MeshPerVertexEXT) 2 BuiltIn ClipDistance
                               MemberDecorate 38(gl_MeshPerVertexEXT) 3 BuiltIn CullDistance
-                              Decorate 38(gl_MeshPerVertexEXT) Block
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 4 PerPrimitiveNV
-                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 4 BuiltIn PrimitiveShadingRateKHR
                               Decorate 90(gl_MeshPerPrimitiveEXT) Block
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 4 BuiltIn PrimitiveShadingRateKHR
+                              MemberDecorate 90(gl_MeshPerPrimitiveEXT) 4 PerPrimitiveNV
                               Decorate 140(gl_PrimitiveTriangleIndicesEXT) BuiltIn PrimitiveTriangleIndicesEXT
                               Decorate 158(gl_DrawIDARB) BuiltIn DrawIndex
                               Decorate 161(gl_ViewIndex) BuiltIn ViewIndex
diff --git a/Test/baseResults/spv.ext.meshShaderRedeclBuiltins.mesh.out b/Test/baseResults/spv.ext.meshShaderRedeclBuiltins.mesh.out
index 35773007..534cf403 100644
--- a/Test/baseResults/spv.ext.meshShaderRedeclBuiltins.mesh.out
+++ b/Test/baseResults/spv.ext.meshShaderRedeclBuiltins.mesh.out
@@ -36,20 +36,20 @@ spv.ext.meshShaderRedeclBuiltins.mesh
                               Name 122  "gl_PrimitivePointIndicesEXT"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 26(gl_MeshPerVertexEXT) Block
                               MemberDecorate 26(gl_MeshPerVertexEXT) 0 BuiltIn Position
                               MemberDecorate 26(gl_MeshPerVertexEXT) 1 BuiltIn PointSize
                               MemberDecorate 26(gl_MeshPerVertexEXT) 2 BuiltIn ClipDistance
                               MemberDecorate 26(gl_MeshPerVertexEXT) 3 BuiltIn CullDistance
-                              Decorate 26(gl_MeshPerVertexEXT) Block
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
-                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
                               Decorate 78(gl_MeshPerPrimitiveEXT) Block
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 0 BuiltIn PrimitiveId
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 0 PerPrimitiveNV
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 1 BuiltIn Layer
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 1 PerPrimitiveNV
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 2 BuiltIn ViewportIndex
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 2 PerPrimitiveNV
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 3 BuiltIn CullPrimitiveEXT
+                              MemberDecorate 78(gl_MeshPerPrimitiveEXT) 3 PerPrimitiveNV
                               Decorate 122(gl_PrimitivePointIndicesEXT) BuiltIn PrimitivePointIndicesEXT
                               Decorate 127 BuiltIn WorkgroupSize
                2:             TypeVoid
diff --git a/Test/baseResults/spv.ext.meshShaderTaskMem.mesh.out b/Test/baseResults/spv.ext.meshShaderTaskMem.mesh.out
index b206177e..5af26300 100644
--- a/Test/baseResults/spv.ext.meshShaderTaskMem.mesh.out
+++ b/Test/baseResults/spv.ext.meshShaderTaskMem.mesh.out
@@ -33,11 +33,11 @@ spv.ext.meshShaderTaskMem.mesh
                               Decorate 18(outBlock) Block
                               Decorate 22(myblk) Location 0
                               Decorate 35 ArrayStride 4
+                              Decorate 36(bufferBlock) Block
                               MemberDecorate 36(bufferBlock) 0 Offset 0
                               MemberDecorate 36(bufferBlock) 1 Offset 16
-                              Decorate 36(bufferBlock) Block
-                              Decorate 38(mybuf) DescriptorSet 0
                               Decorate 38(mybuf) Binding 0
+                              Decorate 38(mybuf) DescriptorSet 0
                               Decorate 57 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.ext.meshShaderUserDefined.mesh.out b/Test/baseResults/spv.ext.meshShaderUserDefined.mesh.out
index dc347aac..6fcd594e 100644
--- a/Test/baseResults/spv.ext.meshShaderUserDefined.mesh.out
+++ b/Test/baseResults/spv.ext.meshShaderUserDefined.mesh.out
@@ -34,13 +34,13 @@ spv.ext.meshShaderUserDefined.mesh
                               Name 104  "blk2"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 30(myblock) Block
                               MemberDecorate 30(myblock) 0 PerPrimitiveNV
                               MemberDecorate 30(myblock) 1 PerPrimitiveNV
                               MemberDecorate 30(myblock) 2 PerPrimitiveNV
                               MemberDecorate 30(myblock) 3 PerPrimitiveNV
                               MemberDecorate 30(myblock) 4 PerPrimitiveNV
                               MemberDecorate 30(myblock) 5 PerPrimitiveNV
-                              Decorate 30(myblock) Block
                               Decorate 34(blk) Location 0
                               Decorate 100(myblock2) Block
                               Decorate 104(blk2) Location 20
diff --git a/Test/baseResults/spv.ext.meshTaskShader.task.out b/Test/baseResults/spv.ext.meshTaskShader.task.out
index 41a81d0a..d3f26116 100644
--- a/Test/baseResults/spv.ext.meshTaskShader.task.out
+++ b/Test/baseResults/spv.ext.meshTaskShader.task.out
@@ -29,13 +29,13 @@ spv.ext.meshTaskShader.task
                               Name 80  "mytask"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
-                              MemberDecorate 37(block0) 0 Offset 0
                               Decorate 37(block0) Block
-                              Decorate 39 DescriptorSet 0
+                              MemberDecorate 37(block0) 0 Offset 0
                               Decorate 39 Binding 1
-                              Decorate 55(uni_image) DescriptorSet 0
-                              Decorate 55(uni_image) Binding 0
+                              Decorate 39 DescriptorSet 0
                               Decorate 55(uni_image) NonReadable
+                              Decorate 55(uni_image) Binding 0
+                              Decorate 55(uni_image) DescriptorSet 0
                               Decorate 102 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.ext.textureShadowLod.frag.out b/Test/baseResults/spv.ext.textureShadowLod.frag.out
index ca4a8727..c4f9f352 100644
--- a/Test/baseResults/spv.ext.textureShadowLod.frag.out
+++ b/Test/baseResults/spv.ext.textureShadowLod.frag.out
@@ -18,13 +18,13 @@ spv.ext.textureShadowLod.frag
                               Name 24  "sca"
                               Name 43  "sc"
                               Decorate 8(c) Location 0
-                              Decorate 12(s2da) DescriptorSet 0
                               Decorate 12(s2da) Binding 0
+                              Decorate 12(s2da) DescriptorSet 0
                               Decorate 16(tc) Location 0
-                              Decorate 24(sca) DescriptorSet 0
                               Decorate 24(sca) Binding 1
-                              Decorate 43(sc) DescriptorSet 0
+                              Decorate 24(sca) DescriptorSet 0
                               Decorate 43(sc) Binding 2
+                              Decorate 43(sc) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.float16.frag.out b/Test/baseResults/spv.float16.frag.out
index 5c33e2ce..21e91638 100644
--- a/Test/baseResults/spv.float16.frag.out
+++ b/Test/baseResults/spv.float16.frag.out
@@ -122,42 +122,42 @@ Validation failed
                               MemberDecorate 518(S) 1 Offset 4
                               MemberDecorate 518(S) 2 Offset 8
                               Decorate 519 ArrayStride 16
+                              Decorate 520(B1) Block
                               MemberDecorate 520(B1) 0 Offset 0
                               MemberDecorate 520(B1) 1 Offset 4
                               MemberDecorate 520(B1) 2 Offset 8
                               MemberDecorate 520(B1) 3 Offset 16
                               MemberDecorate 520(B1) 4 ColMajor
-                              MemberDecorate 520(B1) 4 Offset 48
                               MemberDecorate 520(B1) 4 MatrixStride 16
+                              MemberDecorate 520(B1) 4 Offset 48
                               MemberDecorate 520(B1) 5 ColMajor
-                              MemberDecorate 520(B1) 5 Offset 80
                               MemberDecorate 520(B1) 5 MatrixStride 16
+                              MemberDecorate 520(B1) 5 Offset 80
                               MemberDecorate 520(B1) 6 Offset 144
                               MemberDecorate 520(B1) 7 Offset 160
-                              Decorate 520(B1) Block
-                              Decorate 522 DescriptorSet 0
                               Decorate 522 Binding 0
+                              Decorate 522 DescriptorSet 0
                               Decorate 523 ArrayStride 2
                               Decorate 524 ArrayStride 12
                               MemberDecorate 525(S) 0 Offset 0
                               MemberDecorate 525(S) 1 Offset 4
                               MemberDecorate 525(S) 2 Offset 8
                               Decorate 526 ArrayStride 16
+                              Decorate 527(B2) BufferBlock
                               MemberDecorate 527(B2) 0 Offset 0
                               MemberDecorate 527(B2) 1 Offset 4
                               MemberDecorate 527(B2) 2 Offset 8
                               MemberDecorate 527(B2) 3 Offset 14
                               MemberDecorate 527(B2) 4 RowMajor
-                              MemberDecorate 527(B2) 4 Offset 20
                               MemberDecorate 527(B2) 4 MatrixStride 4
+                              MemberDecorate 527(B2) 4 Offset 20
                               MemberDecorate 527(B2) 5 RowMajor
-                              MemberDecorate 527(B2) 5 Offset 32
                               MemberDecorate 527(B2) 5 MatrixStride 4
+                              MemberDecorate 527(B2) 5 Offset 32
                               MemberDecorate 527(B2) 6 Offset 56
                               MemberDecorate 527(B2) 7 Offset 72
-                              Decorate 527(B2) BufferBlock
-                              Decorate 529 DescriptorSet 0
                               Decorate 529 Binding 0
+                              Decorate 529 DescriptorSet 0
                               Decorate 530(sf16) SpecId 100
                               Decorate 531(sf) SpecId 101
                               Decorate 532(sd) SpecId 102
diff --git a/Test/baseResults/spv.float16Fetch.frag.out b/Test/baseResults/spv.float16Fetch.frag.out
index f61bde34..cfe24914 100644
--- a/Test/baseResults/spv.float16Fetch.frag.out
+++ b/Test/baseResults/spv.float16Fetch.frag.out
@@ -207,117 +207,117 @@ Validation failed
                               Name 5783  "t2DMS"
                               Name 5785  "t2DMSArray"
                               Name 5786  "bias"
-                              Decorate 125(s1D) DescriptorSet 0
                               Decorate 125(s1D) Binding 0
+                              Decorate 125(s1D) DescriptorSet 0
                               Decorate 128(c1) Location 0
                               Decorate 135(f16c1) Location 11
                               Decorate 137(f16bias) Location 16
-                              Decorate 145(s2D) DescriptorSet 0
                               Decorate 145(s2D) Binding 1
+                              Decorate 145(s2D) DescriptorSet 0
                               Decorate 148(c2) Location 1
                               Decorate 156(f16c2) Location 12
-                              Decorate 165(s3D) DescriptorSet 0
                               Decorate 165(s3D) Binding 2
+                              Decorate 165(s3D) DescriptorSet 0
                               Decorate 169(c3) Location 2
                               Decorate 177(f16c3) Location 13
-                              Decorate 186(sCube) DescriptorSet 0
                               Decorate 186(sCube) Binding 4
-                              Decorate 201(s1DShadow) DescriptorSet 0
+                              Decorate 186(sCube) DescriptorSet 0
                               Decorate 201(s1DShadow) Binding 11
+                              Decorate 201(s1DShadow) DescriptorSet 0
                               Decorate 215(compare) Location 4
-                              Decorate 226(s2DShadow) DescriptorSet 0
                               Decorate 226(s2DShadow) Binding 12
-                              Decorate 247(sCubeShadow) DescriptorSet 0
+                              Decorate 226(s2DShadow) DescriptorSet 0
                               Decorate 247(sCubeShadow) Binding 14
+                              Decorate 247(sCubeShadow) DescriptorSet 0
                               Decorate 251(c4) Location 3
-                              Decorate 271(s1DArray) DescriptorSet 0
                               Decorate 271(s1DArray) Binding 7
-                              Decorate 286(s2DArray) DescriptorSet 0
+                              Decorate 271(s1DArray) DescriptorSet 0
                               Decorate 286(s2DArray) Binding 8
-                              Decorate 301(sCubeArray) DescriptorSet 0
+                              Decorate 286(s2DArray) DescriptorSet 0
                               Decorate 301(sCubeArray) Binding 9
+                              Decorate 301(sCubeArray) DescriptorSet 0
                               Decorate 309(f16c4) Location 14
-                              Decorate 318(s1DArrayShadow) DescriptorSet 0
                               Decorate 318(s1DArrayShadow) Binding 15
-                              Decorate 339(s2DArrayShadow) DescriptorSet 0
+                              Decorate 318(s1DArrayShadow) DescriptorSet 0
                               Decorate 339(s2DArrayShadow) Binding 16
-                              Decorate 359(s2DRect) DescriptorSet 0
+                              Decorate 339(s2DArrayShadow) DescriptorSet 0
                               Decorate 359(s2DRect) Binding 3
-                              Decorate 373(s2DRectShadow) DescriptorSet 0
+                              Decorate 359(s2DRect) DescriptorSet 0
                               Decorate 373(s2DRectShadow) Binding 13
-                              Decorate 393(sCubeArrayShadow) DescriptorSet 0
+                              Decorate 373(s2DRectShadow) DescriptorSet 0
                               Decorate 393(sCubeArrayShadow) Binding 17
+                              Decorate 393(sCubeArrayShadow) DescriptorSet 0
                               Decorate 565(lod) Location 5
                               Decorate 572(f16lod) Location 15
-                              Decorate 1300(sBuffer) DescriptorSet 0
                               Decorate 1300(sBuffer) Binding 5
-                              Decorate 1311(s2DMS) DescriptorSet 0
+                              Decorate 1300(sBuffer) DescriptorSet 0
                               Decorate 1311(s2DMS) Binding 6
-                              Decorate 1322(s2DMSArray) DescriptorSet 0
+                              Decorate 1311(s2DMS) DescriptorSet 0
                               Decorate 1322(s2DMSArray) Binding 10
+                              Decorate 1322(s2DMSArray) DescriptorSet 0
                               Decorate 1393(dPdxy1) Location 8
                               Decorate 1400(f16dPdxy1) Location 18
                               Decorate 1407(dPdxy2) Location 9
                               Decorate 1414(f16dPdxy2) Location 19
                               Decorate 1421(dPdxy3) Location 10
                               Decorate 1428(f16dPdxy3) Location 20
-                              Decorate 2909(i1D) DescriptorSet 1
                               Decorate 2909(i1D) Binding 0
-                              Decorate 2918(i2D) DescriptorSet 1
+                              Decorate 2909(i1D) DescriptorSet 1
                               Decorate 2918(i2D) Binding 1
-                              Decorate 2927(i3D) DescriptorSet 1
+                              Decorate 2918(i2D) DescriptorSet 1
                               Decorate 2927(i3D) Binding 2
-                              Decorate 2936(i2DRect) DescriptorSet 1
+                              Decorate 2927(i3D) DescriptorSet 1
                               Decorate 2936(i2DRect) Binding 3
-                              Decorate 2945(iCube) DescriptorSet 1
+                              Decorate 2936(i2DRect) DescriptorSet 1
                               Decorate 2945(iCube) Binding 4
-                              Decorate 2954(iBuffer) DescriptorSet 1
+                              Decorate 2945(iCube) DescriptorSet 1
                               Decorate 2954(iBuffer) Binding 8
-                              Decorate 2963(i1DArray) DescriptorSet 1
+                              Decorate 2954(iBuffer) DescriptorSet 1
                               Decorate 2963(i1DArray) Binding 5
-                              Decorate 2972(i2DArray) DescriptorSet 1
+                              Decorate 2963(i1DArray) DescriptorSet 1
                               Decorate 2972(i2DArray) Binding 6
-                              Decorate 2981(iCubeArray) DescriptorSet 1
+                              Decorate 2972(i2DArray) DescriptorSet 1
                               Decorate 2981(iCubeArray) Binding 7
-                              Decorate 2990(i2DMS) DescriptorSet 1
+                              Decorate 2981(iCubeArray) DescriptorSet 1
                               Decorate 2990(i2DMS) Binding 9
-                              Decorate 2999(i2DMSArray) DescriptorSet 1
+                              Decorate 2990(i2DMS) DescriptorSet 1
                               Decorate 2999(i2DMSArray) Binding 10
+                              Decorate 2999(i2DMSArray) DescriptorSet 1
                               Decorate 4187(lodClamp) Location 7
                               Decorate 4194(f16lodClamp) Location 17
-                              Decorate 5316(t1D) DescriptorSet 2
                               Decorate 5316(t1D) Binding 0
-                              Decorate 5320(s) DescriptorSet 2
+                              Decorate 5316(t1D) DescriptorSet 2
                               Decorate 5320(s) Binding 11
-                              Decorate 5336(t2D) DescriptorSet 2
+                              Decorate 5320(s) DescriptorSet 2
                               Decorate 5336(t2D) Binding 1
-                              Decorate 5353(t3D) DescriptorSet 2
+                              Decorate 5336(t2D) DescriptorSet 2
                               Decorate 5353(t3D) Binding 2
-                              Decorate 5370(tCube) DescriptorSet 2
+                              Decorate 5353(t3D) DescriptorSet 2
                               Decorate 5370(tCube) Binding 4
-                              Decorate 5387(sShadow) DescriptorSet 2
+                              Decorate 5370(tCube) DescriptorSet 2
                               Decorate 5387(sShadow) Binding 12
-                              Decorate 5451(t1DArray) DescriptorSet 2
+                              Decorate 5387(sShadow) DescriptorSet 2
                               Decorate 5451(t1DArray) Binding 5
-                              Decorate 5468(t2DArray) DescriptorSet 2
+                              Decorate 5451(t1DArray) DescriptorSet 2
                               Decorate 5468(t2DArray) Binding 6
-                              Decorate 5485(tCubeArray) DescriptorSet 2
+                              Decorate 5468(t2DArray) DescriptorSet 2
                               Decorate 5485(tCubeArray) Binding 7
-                              Decorate 5543(t2DRect) DescriptorSet 2
+                              Decorate 5485(tCubeArray) DescriptorSet 2
                               Decorate 5543(t2DRect) Binding 3
-                              Decorate 5603(subpass) DescriptorSet 3
+                              Decorate 5543(t2DRect) DescriptorSet 2
                               Decorate 5603(subpass) Binding 0
+                              Decorate 5603(subpass) DescriptorSet 3
                               Decorate 5603(subpass) InputAttachmentIndex 0
-                              Decorate 5609(subpassMS) DescriptorSet 3
                               Decorate 5609(subpassMS) Binding 1
+                              Decorate 5609(subpassMS) DescriptorSet 3
                               Decorate 5609(subpassMS) InputAttachmentIndex 0
                               Decorate 5777(fragColor) Location 0
-                              Decorate 5781(tBuffer) DescriptorSet 2
                               Decorate 5781(tBuffer) Binding 8
-                              Decorate 5783(t2DMS) DescriptorSet 2
+                              Decorate 5781(tBuffer) DescriptorSet 2
                               Decorate 5783(t2DMS) Binding 9
-                              Decorate 5785(t2DMSArray) DescriptorSet 2
+                              Decorate 5783(t2DMS) DescriptorSet 2
                               Decorate 5785(t2DMSArray) Binding 10
+                              Decorate 5785(t2DMSArray) DescriptorSet 2
                               Decorate 5786(bias) Location 6
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.float16NoRelaxed.vert.out b/Test/baseResults/spv.float16NoRelaxed.vert.out
index 9e821ab2..2f72839d 100644
--- a/Test/baseResults/spv.float16NoRelaxed.vert.out
+++ b/Test/baseResults/spv.float16NoRelaxed.vert.out
@@ -27,10 +27,10 @@ spv.float16NoRelaxed.vert
                               Decorate 11(gl_SubgroupInvocationID) BuiltIn SubgroupLocalInvocationId
                               Decorate 12 RelaxedPrecision
                               Decorate 25 ArrayStride 4
-                              MemberDecorate 26(Buffer1) 0 Offset 0
                               Decorate 26(Buffer1) Block
-                              Decorate 28 DescriptorSet 0
+                              MemberDecorate 26(Buffer1) 0 Offset 0
                               Decorate 28 Binding 0
+                              Decorate 28 DescriptorSet 0
                               Decorate 30(gl_VertexIndex) BuiltIn VertexIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.float32.frag.out b/Test/baseResults/spv.float32.frag.out
index d2cc6094..fbde7e5b 100644
--- a/Test/baseResults/spv.float32.frag.out
+++ b/Test/baseResults/spv.float32.frag.out
@@ -111,21 +111,21 @@ spv.float32.frag
                               MemberDecorate 528(S) 1 Offset 8
                               MemberDecorate 528(S) 2 Offset 16
                               Decorate 529 ArrayStride 32
+                              Decorate 530(B1) Block
                               MemberDecorate 530(B1) 0 Offset 0
                               MemberDecorate 530(B1) 1 Offset 8
                               MemberDecorate 530(B1) 2 Offset 16
                               MemberDecorate 530(B1) 3 Offset 32
                               MemberDecorate 530(B1) 4 ColMajor
-                              MemberDecorate 530(B1) 4 Offset 64
                               MemberDecorate 530(B1) 4 MatrixStride 16
+                              MemberDecorate 530(B1) 4 Offset 64
                               MemberDecorate 530(B1) 5 ColMajor
-                              MemberDecorate 530(B1) 5 Offset 96
                               MemberDecorate 530(B1) 5 MatrixStride 16
+                              MemberDecorate 530(B1) 5 Offset 96
                               MemberDecorate 530(B1) 6 Offset 160
                               MemberDecorate 530(B1) 7 Offset 192
-                              Decorate 530(B1) Block
-                              Decorate 532 DescriptorSet 0
                               Decorate 532 Binding 0
+                              Decorate 532 DescriptorSet 0
                               Decorate 533(sf16) SpecId 100
                               Decorate 534(sf) SpecId 101
                               Decorate 535(sd) SpecId 102
diff --git a/Test/baseResults/spv.float64.frag.out b/Test/baseResults/spv.float64.frag.out
index 68e8f1c7..de8a8ee6 100644
--- a/Test/baseResults/spv.float64.frag.out
+++ b/Test/baseResults/spv.float64.frag.out
@@ -109,21 +109,21 @@ Validation failed
                               MemberDecorate 471(S) 1 Offset 16
                               MemberDecorate 471(S) 2 Offset 32
                               Decorate 472 ArrayStride 64
+                              Decorate 473(B1) Block
                               MemberDecorate 473(B1) 0 Offset 0
                               MemberDecorate 473(B1) 1 Offset 16
                               MemberDecorate 473(B1) 2 Offset 32
                               MemberDecorate 473(B1) 3 Offset 64
                               MemberDecorate 473(B1) 4 ColMajor
-                              MemberDecorate 473(B1) 4 Offset 96
                               MemberDecorate 473(B1) 4 MatrixStride 32
+                              MemberDecorate 473(B1) 4 Offset 96
                               MemberDecorate 473(B1) 5 ColMajor
-                              MemberDecorate 473(B1) 5 Offset 160
                               MemberDecorate 473(B1) 5 MatrixStride 32
+                              MemberDecorate 473(B1) 5 Offset 160
                               MemberDecorate 473(B1) 6 Offset 288
                               MemberDecorate 473(B1) 7 Offset 352
-                              Decorate 473(B1) Block
-                              Decorate 475 DescriptorSet 0
                               Decorate 475 Binding 0
+                              Decorate 475 DescriptorSet 0
                               Decorate 476(sf16) SpecId 100
                               Decorate 478(sf) SpecId 101
                               Decorate 479(sd) SpecId 102
diff --git a/Test/baseResults/spv.floatFetch.frag.out b/Test/baseResults/spv.floatFetch.frag.out
index 251074d4..0848455f 100644
--- a/Test/baseResults/spv.floatFetch.frag.out
+++ b/Test/baseResults/spv.floatFetch.frag.out
@@ -190,107 +190,107 @@ Validation failed
                               Name 3496  "t2DMS"
                               Name 3498  "t2DMSArray"
                               Name 3499  "bias"
-                              Decorate 124(s1D) DescriptorSet 0
                               Decorate 124(s1D) Binding 0
+                              Decorate 124(s1D) DescriptorSet 0
                               Decorate 127(c1) Location 0
-                              Decorate 135(s2D) DescriptorSet 0
                               Decorate 135(s2D) Binding 1
+                              Decorate 135(s2D) DescriptorSet 0
                               Decorate 138(c2) Location 1
-                              Decorate 146(s3D) DescriptorSet 0
                               Decorate 146(s3D) Binding 2
+                              Decorate 146(s3D) DescriptorSet 0
                               Decorate 150(c3) Location 2
-                              Decorate 158(sCube) DescriptorSet 0
                               Decorate 158(sCube) Binding 4
-                              Decorate 167(s1DShadow) DescriptorSet 0
+                              Decorate 158(sCube) DescriptorSet 0
                               Decorate 167(s1DShadow) Binding 11
-                              Decorate 182(s2DShadow) DescriptorSet 0
+                              Decorate 167(s1DShadow) DescriptorSet 0
                               Decorate 182(s2DShadow) Binding 12
-                              Decorate 194(sCubeShadow) DescriptorSet 0
+                              Decorate 182(s2DShadow) DescriptorSet 0
                               Decorate 194(sCubeShadow) Binding 14
+                              Decorate 194(sCubeShadow) DescriptorSet 0
                               Decorate 197(c4) Location 3
-                              Decorate 208(s1DArray) DescriptorSet 0
                               Decorate 208(s1DArray) Binding 7
-                              Decorate 217(s2DArray) DescriptorSet 0
+                              Decorate 208(s1DArray) DescriptorSet 0
                               Decorate 217(s2DArray) Binding 8
-                              Decorate 226(sCubeArray) DescriptorSet 0
+                              Decorate 217(s2DArray) DescriptorSet 0
                               Decorate 226(sCubeArray) Binding 9
-                              Decorate 235(s1DArrayShadow) DescriptorSet 0
+                              Decorate 226(sCubeArray) DescriptorSet 0
                               Decorate 235(s1DArrayShadow) Binding 15
-                              Decorate 247(s2DArrayShadow) DescriptorSet 0
+                              Decorate 235(s1DArrayShadow) DescriptorSet 0
                               Decorate 247(s2DArrayShadow) Binding 16
-                              Decorate 259(s2DRect) DescriptorSet 0
+                              Decorate 247(s2DArrayShadow) DescriptorSet 0
                               Decorate 259(s2DRect) Binding 3
-                              Decorate 268(s2DRectShadow) DescriptorSet 0
+                              Decorate 259(s2DRect) DescriptorSet 0
                               Decorate 268(s2DRectShadow) Binding 13
-                              Decorate 280(sCubeArrayShadow) DescriptorSet 0
+                              Decorate 268(s2DRectShadow) DescriptorSet 0
                               Decorate 280(sCubeArrayShadow) Binding 17
+                              Decorate 280(sCubeArrayShadow) DescriptorSet 0
                               Decorate 283(compare) Location 4
                               Decorate 371(lod) Location 5
-                              Decorate 773(sBuffer) DescriptorSet 0
                               Decorate 773(sBuffer) Binding 5
-                              Decorate 784(s2DMS) DescriptorSet 0
+                              Decorate 773(sBuffer) DescriptorSet 0
                               Decorate 784(s2DMS) Binding 6
-                              Decorate 795(s2DMSArray) DescriptorSet 0
+                              Decorate 784(s2DMS) DescriptorSet 0
                               Decorate 795(s2DMSArray) Binding 10
+                              Decorate 795(s2DMSArray) DescriptorSet 0
                               Decorate 866(dPdxy1) Location 8
                               Decorate 873(dPdxy2) Location 9
                               Decorate 880(dPdxy3) Location 10
-                              Decorate 1799(i1D) DescriptorSet 1
                               Decorate 1799(i1D) Binding 0
-                              Decorate 1808(i2D) DescriptorSet 1
+                              Decorate 1799(i1D) DescriptorSet 1
                               Decorate 1808(i2D) Binding 1
-                              Decorate 1817(i3D) DescriptorSet 1
+                              Decorate 1808(i2D) DescriptorSet 1
                               Decorate 1817(i3D) Binding 2
-                              Decorate 1826(i2DRect) DescriptorSet 1
+                              Decorate 1817(i3D) DescriptorSet 1
                               Decorate 1826(i2DRect) Binding 3
-                              Decorate 1835(iCube) DescriptorSet 1
+                              Decorate 1826(i2DRect) DescriptorSet 1
                               Decorate 1835(iCube) Binding 4
-                              Decorate 1844(iBuffer) DescriptorSet 1
+                              Decorate 1835(iCube) DescriptorSet 1
                               Decorate 1844(iBuffer) Binding 8
-                              Decorate 1853(i1DArray) DescriptorSet 1
+                              Decorate 1844(iBuffer) DescriptorSet 1
                               Decorate 1853(i1DArray) Binding 5
-                              Decorate 1862(i2DArray) DescriptorSet 1
+                              Decorate 1853(i1DArray) DescriptorSet 1
                               Decorate 1862(i2DArray) Binding 6
-                              Decorate 1871(iCubeArray) DescriptorSet 1
+                              Decorate 1862(i2DArray) DescriptorSet 1
                               Decorate 1871(iCubeArray) Binding 7
-                              Decorate 1880(i2DMS) DescriptorSet 1
+                              Decorate 1871(iCubeArray) DescriptorSet 1
                               Decorate 1880(i2DMS) Binding 9
-                              Decorate 1889(i2DMSArray) DescriptorSet 1
+                              Decorate 1880(i2DMS) DescriptorSet 1
                               Decorate 1889(i2DMSArray) Binding 10
+                              Decorate 1889(i2DMSArray) DescriptorSet 1
                               Decorate 2603(lodClamp) Location 7
-                              Decorate 3168(t1D) DescriptorSet 2
                               Decorate 3168(t1D) Binding 0
-                              Decorate 3172(s) DescriptorSet 2
+                              Decorate 3168(t1D) DescriptorSet 2
                               Decorate 3172(s) Binding 11
-                              Decorate 3180(t2D) DescriptorSet 2
+                              Decorate 3172(s) DescriptorSet 2
                               Decorate 3180(t2D) Binding 1
-                              Decorate 3189(t3D) DescriptorSet 2
+                              Decorate 3180(t2D) DescriptorSet 2
                               Decorate 3189(t3D) Binding 2
-                              Decorate 3198(tCube) DescriptorSet 2
+                              Decorate 3189(t3D) DescriptorSet 2
                               Decorate 3198(tCube) Binding 4
-                              Decorate 3207(sShadow) DescriptorSet 2
+                              Decorate 3198(tCube) DescriptorSet 2
                               Decorate 3207(sShadow) Binding 12
-                              Decorate 3238(t1DArray) DescriptorSet 2
+                              Decorate 3207(sShadow) DescriptorSet 2
                               Decorate 3238(t1DArray) Binding 5
-                              Decorate 3247(t2DArray) DescriptorSet 2
+                              Decorate 3238(t1DArray) DescriptorSet 2
                               Decorate 3247(t2DArray) Binding 6
-                              Decorate 3256(tCubeArray) DescriptorSet 2
+                              Decorate 3247(t2DArray) DescriptorSet 2
                               Decorate 3256(tCubeArray) Binding 7
-                              Decorate 3285(t2DRect) DescriptorSet 2
+                              Decorate 3256(tCubeArray) DescriptorSet 2
                               Decorate 3285(t2DRect) Binding 3
-                              Decorate 3318(subpass) DescriptorSet 3
+                              Decorate 3285(t2DRect) DescriptorSet 2
                               Decorate 3318(subpass) Binding 0
+                              Decorate 3318(subpass) DescriptorSet 3
                               Decorate 3318(subpass) InputAttachmentIndex 0
-                              Decorate 3324(subpassMS) DescriptorSet 3
                               Decorate 3324(subpassMS) Binding 1
+                              Decorate 3324(subpassMS) DescriptorSet 3
                               Decorate 3324(subpassMS) InputAttachmentIndex 0
                               Decorate 3491(fragColor) Location 0
-                              Decorate 3494(tBuffer) DescriptorSet 2
                               Decorate 3494(tBuffer) Binding 8
-                              Decorate 3496(t2DMS) DescriptorSet 2
+                              Decorate 3494(tBuffer) DescriptorSet 2
                               Decorate 3496(t2DMS) Binding 9
-                              Decorate 3498(t2DMSArray) DescriptorSet 2
+                              Decorate 3496(t2DMS) DescriptorSet 2
                               Decorate 3498(t2DMSArray) Binding 10
+                              Decorate 3498(t2DMSArray) DescriptorSet 2
                               Decorate 3499(bias) Location 6
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.forwardFun.frag.out b/Test/baseResults/spv.forwardFun.frag.out
index 77f39416..d410c4d9 100644
--- a/Test/baseResults/spv.forwardFun.frag.out
+++ b/Test/baseResults/spv.forwardFun.frag.out
@@ -22,8 +22,8 @@ spv.forwardFun.frag
                               Name 36  "d"
                               Name 59  "bigColor"
                               Decorate 10(unreachableReturn() RelaxedPrecision
-                              Decorate 16(foo(vf4;) RelaxedPrecision
                               Decorate 15(bar) RelaxedPrecision
+                              Decorate 16(foo(vf4;) RelaxedPrecision
                               Decorate 18(color) RelaxedPrecision
                               Decorate 20(BaseColor) RelaxedPrecision
                               Decorate 20(BaseColor) Location 1
diff --git a/Test/baseResults/spv.fragmentDensity-es.frag.out b/Test/baseResults/spv.fragmentDensity-es.frag.out
index fb1407e4..f46a28bb 100644
--- a/Test/baseResults/spv.fragmentDensity-es.frag.out
+++ b/Test/baseResults/spv.fragmentDensity-es.frag.out
@@ -18,11 +18,11 @@ spv.fragmentDensity-es.frag
                               Name 14  "FragInvocationCount"
                               Name 16  "gl_FragInvocationCountEXT"
                               Decorate 9(FragSize) Location 0
-                              Decorate 11(gl_FragSizeEXT) Flat
                               Decorate 11(gl_FragSizeEXT) BuiltIn FragSizeEXT
+                              Decorate 11(gl_FragSizeEXT) Flat
                               Decorate 14(FragInvocationCount) Location 2
-                              Decorate 16(gl_FragInvocationCountEXT) Flat
                               Decorate 16(gl_FragInvocationCountEXT) BuiltIn FragInvocationCountEXT
+                              Decorate 16(gl_FragInvocationCountEXT) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.fragmentDensity.frag.out b/Test/baseResults/spv.fragmentDensity.frag.out
index 43261cd1..5ce7a9a6 100644
--- a/Test/baseResults/spv.fragmentDensity.frag.out
+++ b/Test/baseResults/spv.fragmentDensity.frag.out
@@ -18,11 +18,11 @@ spv.fragmentDensity.frag
                               Name 17  "FragInvocationCount"
                               Name 19  "gl_FragInvocationCountEXT"
                               Decorate 9(FragSize) Location 0
-                              Decorate 13(gl_FragSizeEXT) Flat
                               Decorate 13(gl_FragSizeEXT) BuiltIn FragSizeEXT
+                              Decorate 13(gl_FragSizeEXT) Flat
                               Decorate 17(FragInvocationCount) Location 2
-                              Decorate 19(gl_FragInvocationCountEXT) Flat
                               Decorate 19(gl_FragInvocationCountEXT) BuiltIn FragInvocationCountEXT
+                              Decorate 19(gl_FragInvocationCountEXT) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.fsi.frag.out b/Test/baseResults/spv.fsi.frag.out
index 1b5fbf47..d9cd092e 100644
--- a/Test/baseResults/spv.fsi.frag.out
+++ b/Test/baseResults/spv.fsi.frag.out
@@ -18,14 +18,14 @@ spv.fsi.frag
                               MemberName 7(B1) 0  "x"
                               Name 9  "b1"
                               Name 17  "im"
+                              Decorate 7(B1) BufferBlock
                               MemberDecorate 7(B1) 0 Coherent
                               MemberDecorate 7(B1) 0 Offset 0
-                              Decorate 7(B1) BufferBlock
-                              Decorate 9(b1) DescriptorSet 0
                               Decorate 9(b1) Binding 0
-                              Decorate 17(im) DescriptorSet 0
-                              Decorate 17(im) Binding 1
+                              Decorate 9(b1) DescriptorSet 0
                               Decorate 17(im) Coherent
+                              Decorate 17(im) Binding 1
+                              Decorate 17(im) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.funcall.array.frag.out b/Test/baseResults/spv.funcall.array.frag.out
index b4e2bfbe..1a003be6 100644
--- a/Test/baseResults/spv.funcall.array.frag.out
+++ b/Test/baseResults/spv.funcall.array.frag.out
@@ -22,10 +22,10 @@ spv.funcall.array.frag
                               Name 64  "param"
                               Decorate 27(color) Location 0
                               Decorate 28 ArrayStride 16
-                              MemberDecorate 29(ub) 0 Offset 0
                               Decorate 29(ub) Block
-                              Decorate 31 DescriptorSet 0
+                              MemberDecorate 29(ub) 0 Offset 0
                               Decorate 31 Binding 0
+                              Decorate 31 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.functionNestedOpaque.vert.out b/Test/baseResults/spv.functionNestedOpaque.vert.out
index 58787600..0666c091 100644
--- a/Test/baseResults/spv.functionNestedOpaque.vert.out
+++ b/Test/baseResults/spv.functionNestedOpaque.vert.out
@@ -19,8 +19,8 @@ Validation failed
                               Name 21  "bar(struct-S-s211;"
                               Name 20  "p"
                               Name 36  "si"
-                              Decorate 36(si) DescriptorSet 0
                               Decorate 36(si) Binding 0
+                              Decorate 36(si) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.glsl.register.autoassign.frag.out b/Test/baseResults/spv.glsl.register.autoassign.frag.out
index 041edb97..6ee2cdd4 100644
--- a/Test/baseResults/spv.glsl.register.autoassign.frag.out
+++ b/Test/baseResults/spv.glsl.register.autoassign.frag.out
@@ -40,47 +40,47 @@ spv.glsl.register.autoassign.frag
                               Name 128  "g_sSamp_unused2"
                               Name 137  "FragColor"
                               Name 141  "g_tTex_unused3"
-                              Decorate 17(g_tTex1) DescriptorSet 0
                               Decorate 17(g_tTex1) Binding 11
-                              Decorate 21(g_sSamp1) DescriptorSet 0
+                              Decorate 17(g_tTex1) DescriptorSet 0
                               Decorate 21(g_sSamp1) Binding 5
-                              Decorate 27(g_tTex2) DescriptorSet 0
+                              Decorate 21(g_sSamp1) DescriptorSet 0
                               Decorate 27(g_tTex2) Binding 14
-                              Decorate 29(g_sSamp2) DescriptorSet 0
+                              Decorate 27(g_tTex2) DescriptorSet 0
                               Decorate 29(g_sSamp2) Binding 6
-                              Decorate 39(g_tTex3) DescriptorSet 0
+                              Decorate 29(g_sSamp2) DescriptorSet 0
                               Decorate 39(g_tTex3) Binding 13
-                              Decorate 46(g_sSamp3) DescriptorSet 0
+                              Decorate 39(g_tTex3) DescriptorSet 0
                               Decorate 46(g_sSamp3) Binding 7
-                              Decorate 64(g_tTex4) DescriptorSet 0
+                              Decorate 46(g_sSamp3) DescriptorSet 0
                               Decorate 64(g_tTex4) Binding 15
-                              Decorate 69(g_sSamp4) DescriptorSet 0
+                              Decorate 64(g_tTex4) DescriptorSet 0
                               Decorate 69(g_sSamp4) Binding 8
-                              Decorate 84(g_tTex5) DescriptorSet 0
+                              Decorate 69(g_sSamp4) DescriptorSet 0
                               Decorate 84(g_tTex5) Binding 16
-                              Decorate 86(g_sSamp5) DescriptorSet 0
+                              Decorate 84(g_tTex5) DescriptorSet 0
                               Decorate 86(g_sSamp5) Binding 9
+                              Decorate 86(g_sSamp5) DescriptorSet 0
                               MemberDecorate 93(MyStruct_t) 0 Offset 0
                               MemberDecorate 93(MyStruct_t) 1 Offset 4
                               MemberDecorate 93(MyStruct_t) 2 Offset 16
+                              Decorate 95(myblock) Block
                               MemberDecorate 95(myblock) 0 Offset 0
                               MemberDecorate 95(myblock) 1 Offset 32
                               MemberDecorate 95(myblock) 2 Offset 48
                               MemberDecorate 95(myblock) 3 Offset 64
-                              Decorate 95(myblock) Block
-                              Decorate 97 DescriptorSet 0
                               Decorate 97 Binding 24
-                              Decorate 119(g_tTex_unused1) DescriptorSet 0
+                              Decorate 97 DescriptorSet 0
                               Decorate 119(g_tTex_unused1) Binding 10
-                              Decorate 121(g_sSamp_unused1) DescriptorSet 0
+                              Decorate 119(g_tTex_unused1) DescriptorSet 0
                               Decorate 121(g_sSamp_unused1) Binding 0
-                              Decorate 126(g_tTex_unused2) DescriptorSet 0
+                              Decorate 121(g_sSamp_unused1) DescriptorSet 0
                               Decorate 126(g_tTex_unused2) Binding 12
-                              Decorate 128(g_sSamp_unused2) DescriptorSet 0
+                              Decorate 126(g_tTex_unused2) DescriptorSet 0
                               Decorate 128(g_sSamp_unused2) Binding 0
+                              Decorate 128(g_sSamp_unused2) DescriptorSet 0
                               Decorate 137(FragColor) Location 0
-                              Decorate 141(g_tTex_unused3) DescriptorSet 0
                               Decorate 141(g_tTex_unused3) Binding 0
+                              Decorate 141(g_tTex_unused3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.glsl.register.noautoassign.frag.out b/Test/baseResults/spv.glsl.register.noautoassign.frag.out
index ccf68804..b5e6a6e4 100644
--- a/Test/baseResults/spv.glsl.register.noautoassign.frag.out
+++ b/Test/baseResults/spv.glsl.register.noautoassign.frag.out
@@ -40,47 +40,47 @@ spv.glsl.register.noautoassign.frag
                               Name 128  "g_sSamp_unused2"
                               Name 137  "FragColor"
                               Name 141  "g_tTex_unused3"
-                              Decorate 17(g_tTex1) DescriptorSet 0
                               Decorate 17(g_tTex1) Binding 17
-                              Decorate 21(g_sSamp1) DescriptorSet 0
+                              Decorate 17(g_tTex1) DescriptorSet 0
                               Decorate 21(g_sSamp1) Binding 5
-                              Decorate 27(g_tTex2) DescriptorSet 0
+                              Decorate 21(g_sSamp1) DescriptorSet 0
                               Decorate 27(g_tTex2) Binding 18
-                              Decorate 29(g_sSamp2) DescriptorSet 0
+                              Decorate 27(g_tTex2) DescriptorSet 0
                               Decorate 29(g_sSamp2) Binding 6
-                              Decorate 39(g_tTex3) DescriptorSet 0
+                              Decorate 29(g_sSamp2) DescriptorSet 0
                               Decorate 39(g_tTex3) Binding 19
-                              Decorate 46(g_sSamp3) DescriptorSet 0
+                              Decorate 39(g_tTex3) DescriptorSet 0
                               Decorate 46(g_sSamp3) Binding 7
-                              Decorate 64(g_tTex4) DescriptorSet 0
+                              Decorate 46(g_sSamp3) DescriptorSet 0
                               Decorate 64(g_tTex4) Binding 20
-                              Decorate 69(g_sSamp4) DescriptorSet 0
+                              Decorate 64(g_tTex4) DescriptorSet 0
                               Decorate 69(g_sSamp4) Binding 8
-                              Decorate 84(g_tTex5) DescriptorSet 0
+                              Decorate 69(g_sSamp4) DescriptorSet 0
                               Decorate 84(g_tTex5) Binding 21
-                              Decorate 86(g_sSamp5) DescriptorSet 0
+                              Decorate 84(g_tTex5) DescriptorSet 0
                               Decorate 86(g_sSamp5) Binding 9
+                              Decorate 86(g_sSamp5) DescriptorSet 0
                               MemberDecorate 93(MyStruct_t) 0 Offset 0
                               MemberDecorate 93(MyStruct_t) 1 Offset 4
                               MemberDecorate 93(MyStruct_t) 2 Offset 16
+                              Decorate 95(myblock) Block
                               MemberDecorate 95(myblock) 0 Offset 0
                               MemberDecorate 95(myblock) 1 Offset 32
                               MemberDecorate 95(myblock) 2 Offset 48
                               MemberDecorate 95(myblock) 3 Offset 64
-                              Decorate 95(myblock) Block
-                              Decorate 97 DescriptorSet 0
                               Decorate 97 Binding 19
-                              Decorate 119(g_tTex_unused1) DescriptorSet 0
+                              Decorate 97 DescriptorSet 0
                               Decorate 119(g_tTex_unused1) Binding 22
-                              Decorate 121(g_sSamp_unused1) DescriptorSet 0
+                              Decorate 119(g_tTex_unused1) DescriptorSet 0
                               Decorate 121(g_sSamp_unused1) Binding 10
-                              Decorate 126(g_tTex_unused2) DescriptorSet 0
+                              Decorate 121(g_sSamp_unused1) DescriptorSet 0
                               Decorate 126(g_tTex_unused2) Binding 23
-                              Decorate 128(g_sSamp_unused2) DescriptorSet 0
+                              Decorate 126(g_tTex_unused2) DescriptorSet 0
                               Decorate 128(g_sSamp_unused2) Binding 11
+                              Decorate 128(g_sSamp_unused2) DescriptorSet 0
                               Decorate 137(FragColor) Location 0
-                              Decorate 141(g_tTex_unused3) DescriptorSet 0
                               Decorate 141(g_tTex_unused3) Binding 24
+                              Decorate 141(g_tTex_unused3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.hlslOffsets.vert.out b/Test/baseResults/spv.hlslOffsets.vert.out
index d2d6443c..72a996d1 100644
--- a/Test/baseResults/spv.hlslOffsets.vert.out
+++ b/Test/baseResults/spv.hlslOffsets.vert.out
@@ -44,6 +44,7 @@ Shader version: 450
                               MemberName 11(block) 12  "m96"
                               MemberName 11(block) 13  "m112"
                               Name 13  ""
+                              Decorate 11(block) BufferBlock
                               MemberDecorate 11(block) 0 Offset 0
                               MemberDecorate 11(block) 1 Offset 4
                               MemberDecorate 11(block) 2 Offset 16
@@ -58,9 +59,8 @@ Shader version: 450
                               MemberDecorate 11(block) 11 Offset 88
                               MemberDecorate 11(block) 12 Offset 96
                               MemberDecorate 11(block) 13 Offset 112
-                              Decorate 11(block) BufferBlock
-                              Decorate 13 DescriptorSet 0
                               Decorate 13 Binding 0
+                              Decorate 13 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.image.frag.out b/Test/baseResults/spv.image.frag.out
index f71a1cc2..a6141e24 100644
--- a/Test/baseResults/spv.image.frag.out
+++ b/Test/baseResults/spv.image.frag.out
@@ -45,47 +45,47 @@ Validation failed
                               Name 386  "wo2D"
                               Name 391  "fragData"
                               Name 404  "ic4D"
-                              Decorate 15(i1D) DescriptorSet 0
                               Decorate 15(i1D) Binding 0
-                              Decorate 27(i2D) DescriptorSet 0
+                              Decorate 15(i1D) DescriptorSet 0
                               Decorate 27(i2D) Binding 1
-                              Decorate 41(i3D) DescriptorSet 0
+                              Decorate 27(i2D) DescriptorSet 0
                               Decorate 41(i3D) Binding 2
-                              Decorate 48(iCube) DescriptorSet 0
+                              Decorate 41(i3D) DescriptorSet 0
                               Decorate 48(iCube) Binding 3
-                              Decorate 60(iCubeArray) DescriptorSet 0
+                              Decorate 48(iCube) DescriptorSet 0
                               Decorate 60(iCubeArray) Binding 4
-                              Decorate 67(i2DRect) DescriptorSet 0
+                              Decorate 60(iCubeArray) DescriptorSet 0
                               Decorate 67(i2DRect) Binding 5
-                              Decorate 79(i1DArray) DescriptorSet 0
+                              Decorate 67(i2DRect) DescriptorSet 0
                               Decorate 79(i1DArray) Binding 6
-                              Decorate 91(i2DArray) DescriptorSet 0
+                              Decorate 79(i1DArray) DescriptorSet 0
                               Decorate 91(i2DArray) Binding 7
-                              Decorate 98(iBuffer) DescriptorSet 0
+                              Decorate 91(i2DArray) DescriptorSet 0
                               Decorate 98(iBuffer) Binding 8
-                              Decorate 107(i2DMS) DescriptorSet 0
+                              Decorate 98(iBuffer) DescriptorSet 0
                               Decorate 107(i2DMS) Binding 9
-                              Decorate 119(i2DMSArray) DescriptorSet 0
+                              Decorate 107(i2DMS) DescriptorSet 0
                               Decorate 119(i2DMSArray) Binding 10
+                              Decorate 119(i2DMSArray) DescriptorSet 0
                               Decorate 143(ic1D) Flat
                               Decorate 143(ic1D) Location 0
                               Decorate 153(ic2D) Flat
                               Decorate 153(ic2D) Location 1
                               Decorate 163(ic3D) Flat
                               Decorate 163(ic3D) Location 2
-                              Decorate 243(ii1D) DescriptorSet 0
                               Decorate 243(ii1D) Binding 11
-                              Decorate 255(ui2D) DescriptorSet 0
+                              Decorate 243(ii1D) DescriptorSet 0
                               Decorate 255(ui2D) Binding 12
+                              Decorate 255(ui2D) DescriptorSet 0
                               Decorate 258(value) Flat
                               Decorate 258(value) Location 4
-                              Decorate 367(ii2DMS) DescriptorSet 0
                               Decorate 367(ii2DMS) Binding 13
-                              Decorate 377(ui2DMSArray) DescriptorSet 0
+                              Decorate 367(ii2DMS) DescriptorSet 0
                               Decorate 377(ui2DMSArray) Binding 14
-                              Decorate 386(wo2D) DescriptorSet 0
-                              Decorate 386(wo2D) Binding 1
+                              Decorate 377(ui2DMSArray) DescriptorSet 0
                               Decorate 386(wo2D) NonReadable
+                              Decorate 386(wo2D) Binding 1
+                              Decorate 386(wo2D) DescriptorSet 0
                               Decorate 391(fragData) Location 0
                               Decorate 404(ic4D) Flat
                               Decorate 404(ic4D) Location 3
diff --git a/Test/baseResults/spv.imageAtomic64.comp.out b/Test/baseResults/spv.imageAtomic64.comp.out
index 4317ae05..1d0ffd8c 100644
--- a/Test/baseResults/spv.imageAtomic64.comp.out
+++ b/Test/baseResults/spv.imageAtomic64.comp.out
@@ -21,12 +21,12 @@ spv.imageAtomic64.comp
                               Name 14  "ssbo"
                               MemberName 14(ssbo) 0  "y"
                               Name 16  ""
-                              Decorate 9(z) DescriptorSet 0
                               Decorate 9(z) Binding 1
-                              MemberDecorate 14(ssbo) 0 Offset 0
+                              Decorate 9(z) DescriptorSet 0
                               Decorate 14(ssbo) BufferBlock
-                              Decorate 16 DescriptorSet 0
+                              MemberDecorate 14(ssbo) 0 Offset 0
                               Decorate 16 Binding 0
+                              Decorate 16 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 64 0
diff --git a/Test/baseResults/spv.imageAtomic64.frag.out b/Test/baseResults/spv.imageAtomic64.frag.out
index 1c002ab2..35b6c512 100644
--- a/Test/baseResults/spv.imageAtomic64.frag.out
+++ b/Test/baseResults/spv.imageAtomic64.frag.out
@@ -46,36 +46,36 @@ Validation failed
                               Name 240  "u2DMS"
                               Name 458  "ResType"
                               Name 483  "ResType"
+                              Decorate 12(Buf) BufferBlock
                               MemberDecorate 12(Buf) 0 Offset 0
                               MemberDecorate 12(Buf) 1 Offset 8
                               MemberDecorate 12(Buf) 2 Offset 32
                               MemberDecorate 12(Buf) 3 Offset 64
                               MemberDecorate 12(Buf) 4 Offset 96
-                              Decorate 12(Buf) BufferBlock
-                              Decorate 14 DescriptorSet 0
                               Decorate 14 Binding 11
-                              Decorate 18(i1D) DescriptorSet 0
+                              Decorate 14 DescriptorSet 0
                               Decorate 18(i1D) Binding 0
-                              Decorate 35(i3D) DescriptorSet 0
+                              Decorate 18(i1D) DescriptorSet 0
                               Decorate 35(i3D) Binding 2
-                              Decorate 48(iBuf) DescriptorSet 0
+                              Decorate 35(i3D) DescriptorSet 0
                               Decorate 48(iBuf) Binding 4
-                              Decorate 58(i2DArray) DescriptorSet 0
+                              Decorate 48(iBuf) DescriptorSet 0
                               Decorate 58(i2DArray) Binding 6
-                              Decorate 69(i2DRect) DescriptorSet 0
+                              Decorate 58(i2DArray) DescriptorSet 0
                               Decorate 69(i2DRect) Binding 8
-                              Decorate 81(i2DMSArray) DescriptorSet 0
+                              Decorate 69(i2DRect) DescriptorSet 0
                               Decorate 81(i2DMSArray) Binding 10
-                              Decorate 194(u2D) DescriptorSet 0
+                              Decorate 81(i2DMSArray) DescriptorSet 0
                               Decorate 194(u2D) Binding 1
-                              Decorate 207(uCube) DescriptorSet 0
+                              Decorate 194(u2D) DescriptorSet 0
                               Decorate 207(uCube) Binding 3
-                              Decorate 218(u1DArray) DescriptorSet 0
+                              Decorate 207(uCube) DescriptorSet 0
                               Decorate 218(u1DArray) Binding 5
-                              Decorate 229(uCubeArray) DescriptorSet 0
+                              Decorate 218(u1DArray) DescriptorSet 0
                               Decorate 229(uCubeArray) Binding 7
-                              Decorate 240(u2DMS) DescriptorSet 0
+                              Decorate 229(uCubeArray) DescriptorSet 0
                               Decorate 240(u2DMS) Binding 9
+                              Decorate 240(u2DMS) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 64 1
diff --git a/Test/baseResults/spv.imageLoadStoreLod.frag.out b/Test/baseResults/spv.imageLoadStoreLod.frag.out
index 4a16d75a..f38391b1 100644
--- a/Test/baseResults/spv.imageLoadStoreLod.frag.out
+++ b/Test/baseResults/spv.imageLoadStoreLod.frag.out
@@ -44,40 +44,40 @@ spv.imageLoadStoreLod.frag
                               Name 133  "u64i2DArray"
                               Name 136  "ResType"
                               Name 142  "u64iCubeArray"
-                              Decorate 14(i1D) DescriptorSet 0
                               Decorate 14(i1D) Binding 0
-                              Decorate 24(i2D) DescriptorSet 0
+                              Decorate 14(i1D) DescriptorSet 0
                               Decorate 24(i2D) Binding 1
-                              Decorate 34(i3D) DescriptorSet 0
+                              Decorate 24(i2D) DescriptorSet 0
                               Decorate 34(i3D) Binding 2
-                              Decorate 46(iiCube) DescriptorSet 0
+                              Decorate 34(i3D) DescriptorSet 0
                               Decorate 46(iiCube) Binding 3
-                              Decorate 53(ii1DArray) DescriptorSet 0
+                              Decorate 46(iiCube) DescriptorSet 0
                               Decorate 53(ii1DArray) Binding 4
-                              Decorate 60(ui2DArray) DescriptorSet 0
+                              Decorate 53(ii1DArray) DescriptorSet 0
                               Decorate 60(ui2DArray) Binding 5
-                              Decorate 71(uiCubeArray) DescriptorSet 0
+                              Decorate 60(ui2DArray) DescriptorSet 0
                               Decorate 71(uiCubeArray) Binding 6
+                              Decorate 71(uiCubeArray) DescriptorSet 0
                               Decorate 77(fragColor) Location 0
+                              Decorate 86(Buf) BufferBlock
                               MemberDecorate 86(Buf) 0 Offset 0
                               MemberDecorate 86(Buf) 1 Offset 32
-                              Decorate 86(Buf) BufferBlock
-                              Decorate 88 DescriptorSet 0
                               Decorate 88 Binding 14
-                              Decorate 92(i64i1D) DescriptorSet 0
+                              Decorate 88 DescriptorSet 0
                               Decorate 92(i64i1D) Binding 7
-                              Decorate 102(i64i2D) DescriptorSet 0
+                              Decorate 92(i64i1D) DescriptorSet 0
                               Decorate 102(i64i2D) Binding 8
-                              Decorate 111(i64i3D) DescriptorSet 0
+                              Decorate 102(i64i2D) DescriptorSet 0
                               Decorate 111(i64i3D) Binding 9
-                              Decorate 120(u64iCube) DescriptorSet 0
+                              Decorate 111(i64i3D) DescriptorSet 0
                               Decorate 120(u64iCube) Binding 10
-                              Decorate 127(u64i1DArray) DescriptorSet 0
+                              Decorate 120(u64iCube) DescriptorSet 0
                               Decorate 127(u64i1DArray) Binding 11
-                              Decorate 133(u64i2DArray) DescriptorSet 0
+                              Decorate 127(u64i1DArray) DescriptorSet 0
                               Decorate 133(u64i2DArray) Binding 12
-                              Decorate 142(u64iCubeArray) DescriptorSet 0
+                              Decorate 133(u64i2DArray) DescriptorSet 0
                               Decorate 142(u64iCubeArray) Binding 13
+                              Decorate 142(u64iCubeArray) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.int16.amd.frag.out b/Test/baseResults/spv.int16.amd.frag.out
index 53f55377..54b09f00 100644
--- a/Test/baseResults/spv.int16.amd.frag.out
+++ b/Test/baseResults/spv.int16.amd.frag.out
@@ -94,15 +94,15 @@ spv.int16.amd.frag
                               Name 573  "u64_to_u16"
                               Name 574  "i16_to_u16"
                               Name 575  "u16_to_i16"
-                              MemberDecorate 25(Uniforms) 0 Offset 0
                               Decorate 25(Uniforms) Block
-                              Decorate 27 DescriptorSet 0
+                              MemberDecorate 25(Uniforms) 0 Offset 0
                               Decorate 27 Binding 0
+                              Decorate 27 DescriptorSet 0
+                              Decorate 531(Block) Block
                               MemberDecorate 531(Block) 0 Offset 0
                               MemberDecorate 531(Block) 1 Offset 6
-                              Decorate 531(Block) Block
-                              Decorate 533(block) DescriptorSet 0
                               Decorate 533(block) Binding 1
+                              Decorate 533(block) DescriptorSet 0
                               Decorate 535(iu16v) Flat
                               Decorate 535(iu16v) Location 0
                               Decorate 537(ii16) Flat
diff --git a/Test/baseResults/spv.int16.frag.out b/Test/baseResults/spv.int16.frag.out
index ed788f87..c7944ef1 100644
--- a/Test/baseResults/spv.int16.frag.out
+++ b/Test/baseResults/spv.int16.frag.out
@@ -80,10 +80,11 @@ spv.int16.frag
                               Name 546  "block"
                               Name 547  "si16"
                               Name 548  "su16"
-                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 24(Uniforms) Block
-                              Decorate 26 DescriptorSet 0
+                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 26 Binding 0
+                              Decorate 26 DescriptorSet 0
+                              Decorate 544(Block) Block
                               MemberDecorate 544(Block) 0 Offset 0
                               MemberDecorate 544(Block) 1 Offset 4
                               MemberDecorate 544(Block) 2 Offset 8
@@ -92,9 +93,8 @@ spv.int16.frag
                               MemberDecorate 544(Block) 5 Offset 28
                               MemberDecorate 544(Block) 6 Offset 32
                               MemberDecorate 544(Block) 7 Offset 40
-                              Decorate 544(Block) Block
-                              Decorate 546(block) DescriptorSet 0
                               Decorate 546(block) Binding 1
+                              Decorate 546(block) DescriptorSet 0
                               Decorate 547(si16) SpecId 100
                               Decorate 548(su16) SpecId 101
                2:             TypeVoid
diff --git a/Test/baseResults/spv.int32.frag.out b/Test/baseResults/spv.int32.frag.out
index 4ee05c82..254622d6 100644
--- a/Test/baseResults/spv.int32.frag.out
+++ b/Test/baseResults/spv.int32.frag.out
@@ -80,10 +80,11 @@ spv.int32.frag
                               Name 496  "si"
                               Name 497  "su"
                               Name 498  "sb"
-                              MemberDecorate 27(Uniforms) 0 Offset 0
                               Decorate 27(Uniforms) Block
-                              Decorate 29 DescriptorSet 0
+                              MemberDecorate 27(Uniforms) 0 Offset 0
                               Decorate 29 Binding 0
+                              Decorate 29 DescriptorSet 0
+                              Decorate 491(Block) Block
                               MemberDecorate 491(Block) 0 Offset 0
                               MemberDecorate 491(Block) 1 Offset 8
                               MemberDecorate 491(Block) 2 Offset 16
@@ -92,9 +93,8 @@ spv.int32.frag
                               MemberDecorate 491(Block) 5 Offset 56
                               MemberDecorate 491(Block) 6 Offset 64
                               MemberDecorate 491(Block) 7 Offset 80
-                              Decorate 491(Block) Block
-                              Decorate 493(block) DescriptorSet 0
                               Decorate 493(block) Binding 1
+                              Decorate 493(block) DescriptorSet 0
                               Decorate 494(si32) SpecId 100
                               Decorate 495(su32) SpecId 101
                               Decorate 496(si) SpecId 102
diff --git a/Test/baseResults/spv.int64.frag.out b/Test/baseResults/spv.int64.frag.out
index e335a543..5fff827f 100644
--- a/Test/baseResults/spv.int64.frag.out
+++ b/Test/baseResults/spv.int64.frag.out
@@ -71,15 +71,15 @@ Validation failed
                               Name 508  "i_to_u64"
                               Name 510  "i64_to_u"
                               Name 512  "u_to_i64"
-                              MemberDecorate 28(Uniforms) 0 Offset 0
                               Decorate 28(Uniforms) Block
-                              Decorate 30 DescriptorSet 0
+                              MemberDecorate 28(Uniforms) 0 Offset 0
                               Decorate 30 Binding 0
+                              Decorate 30 DescriptorSet 0
+                              Decorate 486(Block) Block
                               MemberDecorate 486(Block) 0 Offset 0
                               MemberDecorate 486(Block) 1 Offset 24
-                              Decorate 486(Block) Block
-                              Decorate 488(block) DescriptorSet 0
                               Decorate 488(block) Binding 1
+                              Decorate 488(block) DescriptorSet 0
                               Decorate 489(si64) SpecId 100
                               Decorate 490(su64) SpecId 101
                               Decorate 491(si) SpecId 102
diff --git a/Test/baseResults/spv.int8.frag.out b/Test/baseResults/spv.int8.frag.out
index 3bfeb1a4..0682281a 100644
--- a/Test/baseResults/spv.int8.frag.out
+++ b/Test/baseResults/spv.int8.frag.out
@@ -80,10 +80,11 @@ spv.int8.frag
                               Name 541  "block"
                               Name 542  "si8"
                               Name 543  "su8"
-                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 24(Uniforms) Block
-                              Decorate 26 DescriptorSet 0
+                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 26 Binding 0
+                              Decorate 26 DescriptorSet 0
+                              Decorate 539(Block) Block
                               MemberDecorate 539(Block) 0 Offset 0
                               MemberDecorate 539(Block) 1 Offset 2
                               MemberDecorate 539(Block) 2 Offset 4
@@ -92,9 +93,8 @@ spv.int8.frag
                               MemberDecorate 539(Block) 5 Offset 14
                               MemberDecorate 539(Block) 6 Offset 16
                               MemberDecorate 539(Block) 7 Offset 20
-                              Decorate 539(Block) Block
-                              Decorate 541(block) DescriptorSet 0
                               Decorate 541(block) Binding 1
+                              Decorate 541(block) DescriptorSet 0
                               Decorate 542(si8) SpecId 100
                               Decorate 543(su8) SpecId 101
                2:             TypeVoid
diff --git a/Test/baseResults/spv.intcoopmat.comp.out b/Test/baseResults/spv.intcoopmat.comp.out
index 24289a9f..59388075 100644
--- a/Test/baseResults/spv.intcoopmat.comp.out
+++ b/Test/baseResults/spv.intcoopmat.comp.out
@@ -91,24 +91,24 @@ spv.intcoopmat.comp
                               Name 285  "scm"
                               Decorate 83 ArrayStride 4
                               Decorate 84 ArrayStride 4
+                              Decorate 85(Block) Block
                               MemberDecorate 85(Block) 0 Offset 0
                               MemberDecorate 85(Block) 1 Offset 4194304
-                              Decorate 85(Block) Block
-                              Decorate 87(block) DescriptorSet 0
                               Decorate 87(block) Binding 0
+                              Decorate 87(block) DescriptorSet 0
                               Decorate 99 ArrayStride 1
                               Decorate 101 ArrayStride 1
+                              Decorate 103(Block16) Block
                               MemberDecorate 103(Block16) 0 Offset 0
                               MemberDecorate 103(Block16) 1 Offset 1048576
                               MemberDecorate 103(Block16) 2 Offset 1048584
-                              Decorate 103(Block16) Block
                               Decorate 104 ArrayStride 4
                               Decorate 105 ArrayStride 4
+                              Decorate 106(Block) Block
                               MemberDecorate 106(Block) 0 Offset 0
                               MemberDecorate 106(Block) 1 Offset 4194304
-                              Decorate 106(Block) Block
-                              Decorate 108(block8) DescriptorSet 0
                               Decorate 108(block8) Binding 0
+                              Decorate 108(block8) DescriptorSet 0
                               Decorate 156(Y) SpecId 0
                               Decorate 247 BuiltIn WorkgroupSize
                               Decorate 280(SC) SpecId 2
diff --git a/Test/baseResults/spv.intrinsicsInteractWithCoopMat.comp.out b/Test/baseResults/spv.intrinsicsInteractWithCoopMat.comp.out
index c19a5924..4abb6d50 100644
--- a/Test/baseResults/spv.intrinsicsInteractWithCoopMat.comp.out
+++ b/Test/baseResults/spv.intrinsicsInteractWithCoopMat.comp.out
@@ -25,10 +25,10 @@ spv.intrinsicsInteractWithCoopMat.comp
                               Name 18  "buf"
                               Name 26  "A"
                               Decorate 15 ArrayStride 16
-                              MemberDecorate 16(Buf) 0 Offset 0
                               Decorate 16(Buf) Block
-                              Decorate 18(buf) DescriptorSet 0
+                              MemberDecorate 16(Buf) 0 Offset 0
                               Decorate 18(buf) Binding 0
+                              Decorate 18(buf) DescriptorSet 0
                               Decorate 35 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.intrinsicsSpirvDecorateId.comp.out b/Test/baseResults/spv.intrinsicsSpirvDecorateId.comp.out
index c454dc60..e9ba47bc 100644
--- a/Test/baseResults/spv.intrinsicsSpirvDecorateId.comp.out
+++ b/Test/baseResults/spv.intrinsicsSpirvDecorateId.comp.out
@@ -19,14 +19,14 @@ spv.intrinsicsSpirvDecorateId.comp
                               MemberName 13(Uniform) 0  "y"
                               Name 15  ""
                               Decorate 9 BuiltIn WorkgroupSize
-                              MemberDecorate 10(CounterBuffer) 0 Offset 0
                               Decorate 10(CounterBuffer) Block
-                              Decorate 12(x) DescriptorSet 0
+                              MemberDecorate 10(CounterBuffer) 0 Offset 0
                               Decorate 12(x) Binding 1
-                              MemberDecorate 13(Uniform) 0 Offset 0
+                              Decorate 12(x) DescriptorSet 0
                               Decorate 13(Uniform) Block
-                              Decorate 15 DescriptorSet 0
+                              MemberDecorate 13(Uniform) 0 Offset 0
                               Decorate 15 Binding 0
+                              Decorate 15 DescriptorSet 0
                               DecorateId 15 DecorationHlslCounterBufferGOOGLE 12(x)
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.intrinsicsSpirvType.rgen.out b/Test/baseResults/spv.intrinsicsSpirvType.rgen.out
index 5d67de70..7b20ece6 100644
--- a/Test/baseResults/spv.intrinsicsSpirvType.rgen.out
+++ b/Test/baseResults/spv.intrinsicsSpirvType.rgen.out
@@ -16,8 +16,8 @@ spv.intrinsicsSpirvType.rgen
                               Name 4  "main"
                               Name 8  "rq"
                               Name 11  "as"
-                              Decorate 11(as) DescriptorSet 0
                               Decorate 11(as) Binding 0
+                              Decorate 11(as) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeRayQueryKHR
diff --git a/Test/baseResults/spv.invariantAll.vert.out b/Test/baseResults/spv.invariantAll.vert.out
index f72d8154..40d275a1 100644
--- a/Test/baseResults/spv.invariantAll.vert.out
+++ b/Test/baseResults/spv.invariantAll.vert.out
@@ -16,17 +16,17 @@ spv.invariantAll.vert
                               MemberName 11(gl_PerVertex) 3  "gl_CullDistance"
                               Name 13  ""
                               Name 17  "v"
-                              MemberDecorate 11(gl_PerVertex) 0 Invariant
-                              MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
-                              MemberDecorate 11(gl_PerVertex) 1 Invariant
-                              MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
-                              MemberDecorate 11(gl_PerVertex) 2 Invariant
-                              MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
-                              MemberDecorate 11(gl_PerVertex) 3 Invariant
-                              MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
                               Decorate 11(gl_PerVertex) Block
-                              Decorate 17(v) Location 0
+                              MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 11(gl_PerVertex) 0 Invariant
+                              MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
+                              MemberDecorate 11(gl_PerVertex) 1 Invariant
+                              MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
+                              MemberDecorate 11(gl_PerVertex) 2 Invariant
+                              MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
+                              MemberDecorate 11(gl_PerVertex) 3 Invariant
                               Decorate 17(v) Invariant
+                              Decorate 17(v) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.layoutNested.vert.out b/Test/baseResults/spv.layoutNested.vert.out
index 2d5111c5..4b2374d4 100644
--- a/Test/baseResults/spv.layoutNested.vert.out
+++ b/Test/baseResults/spv.layoutNested.vert.out
@@ -84,88 +84,88 @@ spv.layoutNested.vert
                               Name 65  "soutinv"
                               Decorate 13 ArrayStride 32
                               MemberDecorate 14(S) 0 Offset 0
-                              MemberDecorate 14(S) 1 ColMajor
                               MemberDecorate 14(S) 1 RelaxedPrecision
-                              MemberDecorate 14(S) 1 Offset 16
+                              MemberDecorate 14(S) 1 ColMajor
                               MemberDecorate 14(S) 1 MatrixStride 16
+                              MemberDecorate 14(S) 1 Offset 16
                               MemberDecorate 14(S) 2 RelaxedPrecision
                               MemberDecorate 14(S) 2 Offset 144
                               Decorate 16 ArrayStride 160
                               Decorate 18 ArrayStride 480
+                              Decorate 19(Block140) Block
                               MemberDecorate 19(Block140) 0 RelaxedPrecision
                               MemberDecorate 19(Block140) 0 Offset 0
                               MemberDecorate 19(Block140) 1 Offset 16
                               MemberDecorate 19(Block140) 2 RelaxedPrecision
                               MemberDecorate 19(Block140) 2 Offset 976
-                              Decorate 19(Block140) Block
-                              Decorate 21(inst140) DescriptorSet 0
                               Decorate 21(inst140) Binding 0
+                              Decorate 21(inst140) DescriptorSet 0
                               Decorate 22 ArrayStride 16
                               MemberDecorate 23(S) 0 Offset 0
-                              MemberDecorate 23(S) 1 ColMajor
                               MemberDecorate 23(S) 1 RelaxedPrecision
-                              MemberDecorate 23(S) 1 Offset 16
+                              MemberDecorate 23(S) 1 ColMajor
                               MemberDecorate 23(S) 1 MatrixStride 8
+                              MemberDecorate 23(S) 1 Offset 16
                               MemberDecorate 23(S) 2 RelaxedPrecision
                               MemberDecorate 23(S) 2 Offset 80
                               Decorate 24 ArrayStride 96
                               Decorate 25 ArrayStride 288
+                              Decorate 26(Block430) BufferBlock
                               MemberDecorate 26(Block430) 0 RelaxedPrecision
                               MemberDecorate 26(Block430) 0 Offset 0
                               MemberDecorate 26(Block430) 1 Offset 16
                               MemberDecorate 26(Block430) 2 RelaxedPrecision
                               MemberDecorate 26(Block430) 2 Offset 592
-                              Decorate 26(Block430) BufferBlock
-                              Decorate 28(inst430) DescriptorSet 0
                               Decorate 28(inst430) Binding 1
+                              Decorate 28(inst430) DescriptorSet 0
                               MemberDecorate 29(S) 1 RelaxedPrecision
                               MemberDecorate 29(S) 2 RelaxedPrecision
                               MemberDecorate 35(T) 0 RowMajor
-                              MemberDecorate 35(T) 0 Offset 0
                               MemberDecorate 35(T) 0 MatrixStride 16
+                              MemberDecorate 35(T) 0 Offset 0
                               MemberDecorate 35(T) 1 Offset 32
                               MemberDecorate 36(Nestor) 0 Offset 0
-                              MemberDecorate 37(Bt1) 0 Offset 0
                               Decorate 37(Bt1) Block
-                              Decorate 39(Btn1) DescriptorSet 1
+                              MemberDecorate 37(Bt1) 0 Offset 0
                               Decorate 39(Btn1) Binding 0
+                              Decorate 39(Btn1) DescriptorSet 1
                               MemberDecorate 40(T) 0 ColMajor
-                              MemberDecorate 40(T) 0 Offset 0
                               MemberDecorate 40(T) 0 MatrixStride 16
+                              MemberDecorate 40(T) 0 Offset 0
                               MemberDecorate 40(T) 1 Offset 32
                               MemberDecorate 41(Nestor) 0 Offset 0
-                              MemberDecorate 42(Bt2) 0 Offset 0
                               Decorate 42(Bt2) Block
-                              Decorate 44(Btn2) DescriptorSet 1
+                              MemberDecorate 42(Bt2) 0 Offset 0
                               Decorate 44(Btn2) Binding 0
+                              Decorate 44(Btn2) DescriptorSet 1
+                              Decorate 45(Bt3) Block
                               MemberDecorate 45(Bt3) 0 Offset 0
                               MemberDecorate 45(Bt3) 1 Offset 48
-                              Decorate 45(Bt3) Block
-                              Decorate 47(Btn3) DescriptorSet 1
                               Decorate 47(Btn3) Binding 0
+                              Decorate 47(Btn3) DescriptorSet 1
                               MemberDecorate 48(T) 0 RowMajor
-                              MemberDecorate 48(T) 0 Offset 0
                               MemberDecorate 48(T) 0 MatrixStride 8
+                              MemberDecorate 48(T) 0 Offset 0
                               MemberDecorate 48(T) 1 Offset 16
                               MemberDecorate 49(Nestor) 0 Offset 0
-                              MemberDecorate 50(bBt1) 0 Offset 0
                               Decorate 50(bBt1) BufferBlock
-                              Decorate 52(bBtn1) DescriptorSet 1
+                              MemberDecorate 50(bBt1) 0 Offset 0
                               Decorate 52(bBtn1) Binding 0
+                              Decorate 52(bBtn1) DescriptorSet 1
                               MemberDecorate 53(T) 0 ColMajor
-                              MemberDecorate 53(T) 0 Offset 0
                               MemberDecorate 53(T) 0 MatrixStride 8
+                              MemberDecorate 53(T) 0 Offset 0
                               MemberDecorate 53(T) 1 Offset 16
                               MemberDecorate 54(Nestor) 0 Offset 0
-                              MemberDecorate 55(bBt2) 0 Offset 0
                               Decorate 55(bBt2) BufferBlock
-                              Decorate 57(bBtn2) DescriptorSet 1
+                              MemberDecorate 55(bBt2) 0 Offset 0
                               Decorate 57(bBtn2) Binding 0
+                              Decorate 57(bBtn2) DescriptorSet 1
+                              Decorate 58(bBt3) BufferBlock
                               MemberDecorate 58(bBt3) 0 Offset 0
                               MemberDecorate 58(bBt3) 1 Offset 24
-                              Decorate 58(bBt3) BufferBlock
-                              Decorate 60(bBtn3) DescriptorSet 1
                               Decorate 60(bBtn3) Binding 0
+                              Decorate 60(bBtn3) DescriptorSet 1
                               Decorate 62(sout) Flat
                               Decorate 62(sout) Location 0
                               MemberDecorate 63(S) 0 Invariant
@@ -173,8 +173,8 @@ spv.layoutNested.vert
                               MemberDecorate 63(S) 1 Invariant
                               MemberDecorate 63(S) 2 RelaxedPrecision
                               MemberDecorate 63(S) 2 Invariant
-                              Decorate 65(soutinv) Location 10
                               Decorate 65(soutinv) Invariant
+                              Decorate 65(soutinv) Location 10
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.load.bool.array.interface.block.frag.out b/Test/baseResults/spv.load.bool.array.interface.block.frag.out
index 7a802990..b50c8b79 100644
--- a/Test/baseResults/spv.load.bool.array.interface.block.frag.out
+++ b/Test/baseResults/spv.load.bool.array.interface.block.frag.out
@@ -19,16 +19,16 @@ spv.load.bool.array.interface.block.frag
                               Name 77  "color"
                               Decorate 8 ArrayStride 4
                               Decorate 10 ArrayStride 12
-                              MemberDecorate 11(ssbo) 0 Offset 0
                               Decorate 11(ssbo) BufferBlock
-                              Decorate 13 DescriptorSet 0
+                              MemberDecorate 11(ssbo) 0 Offset 0
                               Decorate 13 Binding 1
+                              Decorate 13 DescriptorSet 0
                               Decorate 16 ArrayStride 16
                               Decorate 17 ArrayStride 48
-                              MemberDecorate 18(ub) 0 Offset 0
                               Decorate 18(ub) Block
-                              Decorate 20 DescriptorSet 0
+                              MemberDecorate 18(ub) 0 Offset 0
                               Decorate 20 Binding 0
+                              Decorate 20 DescriptorSet 0
                               Decorate 77(color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out
index a9ce54fb..616a245b 100644
--- a/Test/baseResults/spv.localAggregates.frag.out
+++ b/Test/baseResults/spv.localAggregates.frag.out
@@ -45,8 +45,8 @@ spv.localAggregates.frag
                               Decorate 90(condition) Location 18
                               Decorate 98(color) Location 1
                               Decorate 108(gl_FragColor) Location 0
-                              Decorate 128(samp2D) DescriptorSet 0
                               Decorate 128(samp2D) Binding 0
+                              Decorate 128(samp2D) DescriptorSet 0
                               Decorate 134(foo) Flat
                               Decorate 134(foo) Location 2
                               Decorate 135(foo2) Flat
diff --git a/Test/baseResults/spv.matFun.vert.out b/Test/baseResults/spv.matFun.vert.out
index 12018877..b3388c0c 100644
--- a/Test/baseResults/spv.matFun.vert.out
+++ b/Test/baseResults/spv.matFun.vert.out
@@ -32,19 +32,19 @@ spv.matFun.vert
                               Name 86  "param"
                               Name 89  "param"
                               Name 93  "param"
+                              Decorate 74(gl_PerVertex) Block
                               MemberDecorate 74(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 74(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 74(gl_PerVertex) 2 BuiltIn ClipDistance
-                              Decorate 74(gl_PerVertex) Block
-                              MemberDecorate 77(bl) 0 ColMajor
-                              MemberDecorate 77(bl) 0 Offset 0
-                              MemberDecorate 77(bl) 0 MatrixStride 16
-                              MemberDecorate 77(bl) 1 ColMajor
-                              MemberDecorate 77(bl) 1 Offset 64
-                              MemberDecorate 77(bl) 1 MatrixStride 16
                               Decorate 77(bl) Block
-                              Decorate 79(bName) DescriptorSet 0
+                              MemberDecorate 77(bl) 0 ColMajor
+                              MemberDecorate 77(bl) 0 MatrixStride 16
+                              MemberDecorate 77(bl) 0 Offset 0
+                              MemberDecorate 77(bl) 1 ColMajor
+                              MemberDecorate 77(bl) 1 MatrixStride 16
+                              MemberDecorate 77(bl) 1 Offset 64
                               Decorate 79(bName) Binding 0
+                              Decorate 79(bName) DescriptorSet 0
                               Decorate 81(v3) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.memoryQualifier.frag.out b/Test/baseResults/spv.memoryQualifier.frag.out
index 47d63cfd..f6e12c1d 100644
--- a/Test/baseResults/spv.memoryQualifier.frag.out
+++ b/Test/baseResults/spv.memoryQualifier.frag.out
@@ -30,29 +30,30 @@ Validation failed
                               MemberName 50(Buffer) 4  "i1"
                               MemberName 50(Buffer) 5  "data"
                               Name 52  ""
-                              Decorate 12(i1D) DescriptorSet 0
-                              Decorate 12(i1D) Binding 0
                               Decorate 12(i1D) Coherent
-                              Decorate 19(i2D) DescriptorSet 0
-                              Decorate 19(i2D) Binding 1
+                              Decorate 12(i1D) Binding 0
+                              Decorate 12(i1D) DescriptorSet 0
                               Decorate 19(i2D) Volatile
                               Decorate 19(i2D) Coherent
-                              Decorate 28(i2DRect) DescriptorSet 0
-                              Decorate 28(i2DRect) Binding 2
+                              Decorate 19(i2D) Binding 1
+                              Decorate 19(i2D) DescriptorSet 0
                               Decorate 28(i2DRect) Restrict
-                              Decorate 35(i3D) DescriptorSet 0
-                              Decorate 35(i3D) Binding 3
+                              Decorate 28(i2DRect) Binding 2
+                              Decorate 28(i2DRect) DescriptorSet 0
                               Decorate 35(i3D) NonWritable
-                              Decorate 44(iCube) DescriptorSet 0
-                              Decorate 44(iCube) Binding 3
+                              Decorate 35(i3D) Binding 3
+                              Decorate 35(i3D) DescriptorSet 0
                               Decorate 44(iCube) NonReadable
+                              Decorate 44(iCube) Binding 3
+                              Decorate 44(iCube) DescriptorSet 0
                               MemberDecorate 49(Data) 0 Offset 0
                               MemberDecorate 49(Data) 1 Offset 8
+                              Decorate 50(Buffer) BufferBlock
                               MemberDecorate 50(Buffer) 0 Volatile
                               MemberDecorate 50(Buffer) 0 Coherent
                               MemberDecorate 50(Buffer) 0 Offset 0
-                              MemberDecorate 50(Buffer) 1 Coherent
                               MemberDecorate 50(Buffer) 1 Restrict
+                              MemberDecorate 50(Buffer) 1 Coherent
                               MemberDecorate 50(Buffer) 1 Offset 8
                               MemberDecorate 50(Buffer) 2 Coherent
                               MemberDecorate 50(Buffer) 2 NonWritable
@@ -64,9 +65,8 @@ Validation failed
                               MemberDecorate 50(Buffer) 4 Offset 48
                               MemberDecorate 50(Buffer) 5 Coherent
                               MemberDecorate 50(Buffer) 5 Offset 56
-                              Decorate 50(Buffer) BufferBlock
-                              Decorate 52 DescriptorSet 0
                               Decorate 52 Binding 4
+                              Decorate 52 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.memoryScopeSemantics.comp.out b/Test/baseResults/spv.memoryScopeSemantics.comp.out
index 1078aa5f..96a7f3ca 100644
--- a/Test/baseResults/spv.memoryScopeSemantics.comp.out
+++ b/Test/baseResults/spv.memoryScopeSemantics.comp.out
@@ -51,42 +51,42 @@ spv.memoryScopeSemantics.comp
                               MemberName 151(BufferM) 0  "x"
                               Name 153  "bufferm"
                               Name 165  "imageMS"
-                              Decorate 36(imagei) DescriptorSet 0
                               Decorate 36(imagei) Binding 1
-                              Decorate 46(imageu) DescriptorSet 0
+                              Decorate 36(imagei) DescriptorSet 0
                               Decorate 46(imageu) Binding 0
-                              MemberDecorate 66(BufferU) 0 Offset 0
+                              Decorate 46(imageu) DescriptorSet 0
                               Decorate 66(BufferU) Block
-                              Decorate 68(bufferu) DescriptorSet 0
+                              MemberDecorate 66(BufferU) 0 Offset 0
                               Decorate 68(bufferu) Binding 2
-                              MemberDecorate 78(BufferI) 0 Offset 0
+                              Decorate 68(bufferu) DescriptorSet 0
                               Decorate 78(BufferI) Block
-                              Decorate 80(bufferi) DescriptorSet 0
+                              MemberDecorate 78(BufferI) 0 Offset 0
                               Decorate 80(bufferi) Binding 3
+                              Decorate 80(bufferi) DescriptorSet 0
                               Decorate 83 ArrayStride 4
                               MemberDecorate 84(A) 0 Offset 0
-                              MemberDecorate 85(BufferJ) 0 Offset 0
                               Decorate 85(BufferJ) Block
-                              Decorate 88(bufferj) DescriptorSet 0
+                              MemberDecorate 85(BufferJ) 0 Offset 0
                               Decorate 88(bufferj) Binding 4
-                              MemberDecorate 99(BufferK) 0 Offset 0
+                              Decorate 88(bufferj) DescriptorSet 0
                               Decorate 99(BufferK) Block
-                              Decorate 101(bufferk) DescriptorSet 0
+                              MemberDecorate 99(BufferK) 0 Offset 0
                               Decorate 101(bufferk) Binding 7
-                              Decorate 111(imagej) DescriptorSet 0
+                              Decorate 101(bufferk) DescriptorSet 0
                               Decorate 111(imagej) Binding 5
-                              Decorate 123(samp) DescriptorSet 0
+                              Decorate 111(imagej) DescriptorSet 0
                               Decorate 123(samp) Binding 6
-                              MemberDecorate 144(BufferL) 0 Offset 0
+                              Decorate 123(samp) DescriptorSet 0
                               Decorate 144(BufferL) Block
-                              Decorate 146(bufferl) DescriptorSet 0
+                              MemberDecorate 144(BufferL) 0 Offset 0
                               Decorate 146(bufferl) Binding 8
-                              MemberDecorate 151(BufferM) 0 Offset 0
+                              Decorate 146(bufferl) DescriptorSet 0
                               Decorate 151(BufferM) Block
-                              Decorate 153(bufferm) DescriptorSet 0
+                              MemberDecorate 151(BufferM) 0 Offset 0
                               Decorate 153(bufferm) Binding 9
-                              Decorate 165(imageMS) DescriptorSet 0
+                              Decorate 153(bufferm) DescriptorSet 0
                               Decorate 165(imageMS) Binding 10
+                              Decorate 165(imageMS) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.meshShaderBuiltins.mesh.out b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
index f6b0f05c..d130e948 100644
--- a/Test/baseResults/spv.meshShaderBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderBuiltins.mesh.out
@@ -47,32 +47,32 @@ spv.meshShaderBuiltins.mesh
                               Name 146  "gl_PrimitiveCountNV"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 30(gl_MeshPerVertexNV) Block
                               MemberDecorate 30(gl_MeshPerVertexNV) 0 BuiltIn Position
                               MemberDecorate 30(gl_MeshPerVertexNV) 1 BuiltIn PointSize
                               MemberDecorate 30(gl_MeshPerVertexNV) 2 BuiltIn ClipDistance
                               MemberDecorate 30(gl_MeshPerVertexNV) 3 BuiltIn CullDistance
-                              MemberDecorate 30(gl_MeshPerVertexNV) 4 PerViewNV
                               MemberDecorate 30(gl_MeshPerVertexNV) 4 BuiltIn PositionPerViewNV
-                              MemberDecorate 30(gl_MeshPerVertexNV) 5 PerViewNV
+                              MemberDecorate 30(gl_MeshPerVertexNV) 4 PerViewNV
                               MemberDecorate 30(gl_MeshPerVertexNV) 5 BuiltIn ClipDistancePerViewNV
-                              MemberDecorate 30(gl_MeshPerVertexNV) 6 PerViewNV
+                              MemberDecorate 30(gl_MeshPerVertexNV) 5 PerViewNV
                               MemberDecorate 30(gl_MeshPerVertexNV) 6 BuiltIn CullDistancePerViewNV
-                              Decorate 30(gl_MeshPerVertexNV) Block
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
+                              MemberDecorate 30(gl_MeshPerVertexNV) 6 PerViewNV
+                              Decorate 84(gl_MeshPerPrimitiveNV) Block
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 0 BuiltIn PrimitiveId
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 1 BuiltIn Layer
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 2 BuiltIn ViewportIndex
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 3 BuiltIn ViewportMaskNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 4 BuiltIn LayerPerViewNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 4 PerPrimitiveNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 4 PerViewNV
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 4 BuiltIn LayerPerViewNV
+                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 5 BuiltIn ViewportMaskPerViewNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 5 PerPrimitiveNV
                               MemberDecorate 84(gl_MeshPerPrimitiveNV) 5 PerViewNV
-                              MemberDecorate 84(gl_MeshPerPrimitiveNV) 5 BuiltIn ViewportMaskPerViewNV
-                              Decorate 84(gl_MeshPerPrimitiveNV) Block
                               Decorate 129(gl_PrimitiveIndicesNV) BuiltIn PrimitiveIndicesNV
                               Decorate 142(gl_DrawID) BuiltIn DrawIndex
                               Decorate 146(gl_PrimitiveCountNV) BuiltIn PrimitiveCountNV
diff --git a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
index 111fa2bc..71950088 100644
--- a/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderPerViewBuiltins.mesh.out
@@ -42,32 +42,32 @@ spv.meshShaderPerViewBuiltins.mesh
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 20(gl_MeshViewIndicesNV) BuiltIn MeshViewIndicesNV
                               Decorate 21(gl_MeshViewCountNV) BuiltIn MeshViewCountNV
+                              Decorate 36(gl_MeshPerVertexNV) Block
                               MemberDecorate 36(gl_MeshPerVertexNV) 0 BuiltIn Position
                               MemberDecorate 36(gl_MeshPerVertexNV) 1 BuiltIn PointSize
                               MemberDecorate 36(gl_MeshPerVertexNV) 2 BuiltIn ClipDistance
                               MemberDecorate 36(gl_MeshPerVertexNV) 3 BuiltIn CullDistance
-                              MemberDecorate 36(gl_MeshPerVertexNV) 4 PerViewNV
                               MemberDecorate 36(gl_MeshPerVertexNV) 4 BuiltIn PositionPerViewNV
-                              MemberDecorate 36(gl_MeshPerVertexNV) 5 PerViewNV
+                              MemberDecorate 36(gl_MeshPerVertexNV) 4 PerViewNV
                               MemberDecorate 36(gl_MeshPerVertexNV) 5 BuiltIn ClipDistancePerViewNV
-                              MemberDecorate 36(gl_MeshPerVertexNV) 6 PerViewNV
+                              MemberDecorate 36(gl_MeshPerVertexNV) 5 PerViewNV
                               MemberDecorate 36(gl_MeshPerVertexNV) 6 BuiltIn CullDistancePerViewNV
-                              Decorate 36(gl_MeshPerVertexNV) Block
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
+                              MemberDecorate 36(gl_MeshPerVertexNV) 6 PerViewNV
+                              Decorate 68(gl_MeshPerPrimitiveNV) Block
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 0 BuiltIn PrimitiveId
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 1 BuiltIn Layer
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 2 BuiltIn ViewportIndex
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 3 BuiltIn ViewportMaskNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 4 BuiltIn LayerPerViewNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 4 PerPrimitiveNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 4 PerViewNV
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 4 BuiltIn LayerPerViewNV
+                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 5 BuiltIn ViewportMaskPerViewNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 5 PerPrimitiveNV
                               MemberDecorate 68(gl_MeshPerPrimitiveNV) 5 PerViewNV
-                              MemberDecorate 68(gl_MeshPerPrimitiveNV) 5 BuiltIn ViewportMaskPerViewNV
-                              Decorate 68(gl_MeshPerPrimitiveNV) Block
                               Decorate 125 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
index cd6a95b8..d4ae1501 100644
--- a/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
+++ b/Test/baseResults/spv.meshShaderPerViewUserDefined.mesh.out
@@ -43,41 +43,41 @@ spv.meshShaderPerViewUserDefined.mesh
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 20(gl_MeshViewIndicesNV) BuiltIn MeshViewIndicesNV
                               Decorate 21(gl_MeshViewCountNV) BuiltIn MeshViewCountNV
+                              Decorate 31(block) Block
                               MemberDecorate 31(block) 0 PerPrimitiveNV
                               MemberDecorate 31(block) 0 PerViewNV
                               MemberDecorate 31(block) 1 PerPrimitiveNV
                               MemberDecorate 31(block) 2 PerViewNV
-                              Decorate 31(block) Block
                               Decorate 35(b) Location 0
+                              Decorate 64(perviewBlock) Block
                               MemberDecorate 64(perviewBlock) 0 PerPrimitiveNV
                               MemberDecorate 64(perviewBlock) 0 PerViewNV
                               MemberDecorate 64(perviewBlock) 1 PerPrimitiveNV
                               MemberDecorate 64(perviewBlock) 1 PerViewNV
                               MemberDecorate 64(perviewBlock) 2 PerViewNV
                               MemberDecorate 64(perviewBlock) 3 PerViewNV
-                              Decorate 64(perviewBlock) Block
                               Decorate 67(b2) Location 10
                               Decorate 89 BuiltIn WorkgroupSize
-                              Decorate 92(nonBlk1) PerViewNV
                               Decorate 92(nonBlk1) Location 18
+                              Decorate 92(nonBlk1) PerViewNV
+                              Decorate 95(nonBlk2) Location 19
                               Decorate 95(nonBlk2) PerPrimitiveNV
                               Decorate 95(nonBlk2) PerViewNV
-                              Decorate 95(nonBlk2) Location 19
-                              Decorate 96(nonBlk3) PerViewNV
                               Decorate 96(nonBlk3) Location 20
+                              Decorate 96(nonBlk3) PerViewNV
+                              Decorate 97(nonBlk4) Location 21
                               Decorate 97(nonBlk4) PerPrimitiveNV
                               Decorate 97(nonBlk4) PerViewNV
-                              Decorate 97(nonBlk4) Location 21
-                              Decorate 102(nonBlkArr1) PerViewNV
                               Decorate 102(nonBlkArr1) Location 22
+                              Decorate 102(nonBlkArr1) PerViewNV
+                              Decorate 105(nonBlkArr2) Location 24
                               Decorate 105(nonBlkArr2) PerPrimitiveNV
                               Decorate 105(nonBlkArr2) PerViewNV
-                              Decorate 105(nonBlkArr2) Location 24
-                              Decorate 106(nonBlkArr3) PerViewNV
                               Decorate 106(nonBlkArr3) Location 26
+                              Decorate 106(nonBlkArr3) PerViewNV
+                              Decorate 107(nonBlkArr4) Location 28
                               Decorate 107(nonBlkArr4) PerPrimitiveNV
                               Decorate 107(nonBlkArr4) PerViewNV
-                              Decorate 107(nonBlkArr4) Location 28
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out b/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
index 60422d66..b75cfdd5 100644
--- a/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderRedeclBuiltins.mesh.out
@@ -39,20 +39,20 @@ spv.meshShaderRedeclBuiltins.mesh
                               Name 127  "gl_PrimitiveCountNV"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 24(gl_MeshPerVertexNV) Block
                               MemberDecorate 24(gl_MeshPerVertexNV) 0 BuiltIn Position
                               MemberDecorate 24(gl_MeshPerVertexNV) 1 BuiltIn PointSize
                               MemberDecorate 24(gl_MeshPerVertexNV) 2 BuiltIn ClipDistance
                               MemberDecorate 24(gl_MeshPerVertexNV) 3 BuiltIn CullDistance
-                              Decorate 24(gl_MeshPerVertexNV) Block
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 0 BuiltIn PrimitiveId
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 1 BuiltIn Layer
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 2 BuiltIn ViewportIndex
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
-                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 3 BuiltIn ViewportMaskNV
                               Decorate 77(gl_MeshPerPrimitiveNV) Block
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 0 BuiltIn PrimitiveId
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 1 BuiltIn Layer
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 2 BuiltIn ViewportIndex
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 2 PerPrimitiveNV
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 3 BuiltIn ViewportMaskNV
+                              MemberDecorate 77(gl_MeshPerPrimitiveNV) 3 PerPrimitiveNV
                               Decorate 122(gl_PrimitiveIndicesNV) BuiltIn PrimitiveIndicesNV
                               Decorate 127(gl_PrimitiveCountNV) BuiltIn PrimitiveCountNV
                               Decorate 128 BuiltIn WorkgroupSize
diff --git a/Test/baseResults/spv.meshShaderRedeclPerViewBuiltins.mesh.out b/Test/baseResults/spv.meshShaderRedeclPerViewBuiltins.mesh.out
index f6c20383..63e7fc67 100644
--- a/Test/baseResults/spv.meshShaderRedeclPerViewBuiltins.mesh.out
+++ b/Test/baseResults/spv.meshShaderRedeclPerViewBuiltins.mesh.out
@@ -34,20 +34,20 @@ spv.meshShaderRedeclPerViewBuiltins.mesh
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 20(gl_MeshViewIndicesNV) BuiltIn MeshViewIndicesNV
                               Decorate 21(gl_MeshViewCountNV) BuiltIn MeshViewCountNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 0 PerViewNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 0 BuiltIn PositionPerViewNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 1 PerViewNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 1 BuiltIn ClipDistancePerViewNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 2 PerViewNV
-                              MemberDecorate 31(gl_MeshPerVertexNV) 2 BuiltIn CullDistancePerViewNV
                               Decorate 31(gl_MeshPerVertexNV) Block
+                              MemberDecorate 31(gl_MeshPerVertexNV) 0 BuiltIn PositionPerViewNV
+                              MemberDecorate 31(gl_MeshPerVertexNV) 0 PerViewNV
+                              MemberDecorate 31(gl_MeshPerVertexNV) 1 BuiltIn ClipDistancePerViewNV
+                              MemberDecorate 31(gl_MeshPerVertexNV) 1 PerViewNV
+                              MemberDecorate 31(gl_MeshPerVertexNV) 2 BuiltIn CullDistancePerViewNV
+                              MemberDecorate 31(gl_MeshPerVertexNV) 2 PerViewNV
+                              Decorate 63(gl_MeshPerPrimitiveNV) Block
+                              MemberDecorate 63(gl_MeshPerPrimitiveNV) 0 BuiltIn LayerPerViewNV
                               MemberDecorate 63(gl_MeshPerPrimitiveNV) 0 PerPrimitiveNV
                               MemberDecorate 63(gl_MeshPerPrimitiveNV) 0 PerViewNV
-                              MemberDecorate 63(gl_MeshPerPrimitiveNV) 0 BuiltIn LayerPerViewNV
+                              MemberDecorate 63(gl_MeshPerPrimitiveNV) 1 BuiltIn ViewportMaskPerViewNV
                               MemberDecorate 63(gl_MeshPerPrimitiveNV) 1 PerPrimitiveNV
                               MemberDecorate 63(gl_MeshPerPrimitiveNV) 1 PerViewNV
-                              MemberDecorate 63(gl_MeshPerPrimitiveNV) 1 BuiltIn ViewportMaskPerViewNV
-                              Decorate 63(gl_MeshPerPrimitiveNV) Block
                               Decorate 119 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.meshShaderSharedMem.mesh.out b/Test/baseResults/spv.meshShaderSharedMem.mesh.out
index 9ad333c8..2e15ffb5 100644
--- a/Test/baseResults/spv.meshShaderSharedMem.mesh.out
+++ b/Test/baseResults/spv.meshShaderSharedMem.mesh.out
@@ -28,13 +28,13 @@ spv.meshShaderSharedMem.mesh
                               Name 55  "uni_image"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
-                              MemberDecorate 37(block0) 0 Offset 0
                               Decorate 37(block0) Block
-                              Decorate 39 DescriptorSet 0
+                              MemberDecorate 37(block0) 0 Offset 0
                               Decorate 39 Binding 1
-                              Decorate 55(uni_image) DescriptorSet 0
-                              Decorate 55(uni_image) Binding 0
+                              Decorate 39 DescriptorSet 0
                               Decorate 55(uni_image) NonReadable
+                              Decorate 55(uni_image) Binding 0
+                              Decorate 55(uni_image) DescriptorSet 0
                               Decorate 76 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.meshShaderTaskMem.mesh.out b/Test/baseResults/spv.meshShaderTaskMem.mesh.out
index fcbec3d6..adf4cfb9 100644
--- a/Test/baseResults/spv.meshShaderTaskMem.mesh.out
+++ b/Test/baseResults/spv.meshShaderTaskMem.mesh.out
@@ -33,18 +33,18 @@ spv.meshShaderTaskMem.mesh
                               Decorate 18(outBlock) Block
                               Decorate 22(myblk) Location 0
                               Decorate 27 ArrayStride 4
-                              MemberDecorate 28(taskBlock) 0 PerTaskNV
-                              MemberDecorate 28(taskBlock) 0 Offset 0
-                              MemberDecorate 28(taskBlock) 1 PerTaskNV
-                              MemberDecorate 28(taskBlock) 1 Offset 16
                               Decorate 28(taskBlock) Block
+                              MemberDecorate 28(taskBlock) 0 Offset 0
+                              MemberDecorate 28(taskBlock) 0 PerTaskNV
+                              MemberDecorate 28(taskBlock) 1 Offset 16
+                              MemberDecorate 28(taskBlock) 1 PerTaskNV
                               Decorate 30(mytask) Location 0
                               Decorate 35 ArrayStride 4
+                              Decorate 36(bufferBlock) BufferBlock
                               MemberDecorate 36(bufferBlock) 0 Offset 0
                               MemberDecorate 36(bufferBlock) 1 Offset 16
-                              Decorate 36(bufferBlock) BufferBlock
-                              Decorate 38(mybuf) DescriptorSet 0
                               Decorate 38(mybuf) Binding 0
+                              Decorate 38(mybuf) DescriptorSet 0
                               Decorate 57 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.meshShaderUserDefined.mesh.out b/Test/baseResults/spv.meshShaderUserDefined.mesh.out
index 0e5fd050..d4d87356 100644
--- a/Test/baseResults/spv.meshShaderUserDefined.mesh.out
+++ b/Test/baseResults/spv.meshShaderUserDefined.mesh.out
@@ -34,13 +34,13 @@ spv.meshShaderUserDefined.mesh
                               Name 104  "blk2"
                               Decorate 11(gl_LocalInvocationID) BuiltIn LocalInvocationId
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
+                              Decorate 30(myblock) Block
                               MemberDecorate 30(myblock) 0 PerPrimitiveNV
                               MemberDecorate 30(myblock) 1 PerPrimitiveNV
                               MemberDecorate 30(myblock) 2 PerPrimitiveNV
                               MemberDecorate 30(myblock) 3 PerPrimitiveNV
                               MemberDecorate 30(myblock) 4 PerPrimitiveNV
                               MemberDecorate 30(myblock) 5 PerPrimitiveNV
-                              Decorate 30(myblock) Block
                               Decorate 34(blk) Location 0
                               Decorate 100(myblock2) Block
                               Decorate 104(blk2) Location 20
diff --git a/Test/baseResults/spv.meshTaskShader.task.out b/Test/baseResults/spv.meshTaskShader.task.out
index 9442f973..dab67623 100644
--- a/Test/baseResults/spv.meshTaskShader.task.out
+++ b/Test/baseResults/spv.meshTaskShader.task.out
@@ -36,21 +36,21 @@ spv.meshTaskShader.task
                               Decorate 17(gl_WorkGroupID) BuiltIn WorkgroupId
                               Decorate 24(gl_MeshViewIndicesNV) BuiltIn MeshViewIndicesNV
                               Decorate 25(gl_MeshViewCountNV) BuiltIn MeshViewCountNV
-                              MemberDecorate 47(block0) 0 Offset 0
                               Decorate 47(block0) Block
-                              Decorate 49 DescriptorSet 0
+                              MemberDecorate 47(block0) 0 Offset 0
                               Decorate 49 Binding 1
-                              Decorate 65(uni_image) DescriptorSet 0
-                              Decorate 65(uni_image) Binding 0
+                              Decorate 49 DescriptorSet 0
                               Decorate 65(uni_image) NonReadable
+                              Decorate 65(uni_image) Binding 0
+                              Decorate 65(uni_image) DescriptorSet 0
                               Decorate 87 ArrayStride 8
-                              MemberDecorate 88(Task) 0 PerTaskNV
-                              MemberDecorate 88(Task) 0 Offset 0
-                              MemberDecorate 88(Task) 1 PerTaskNV
-                              MemberDecorate 88(Task) 1 Offset 8
-                              MemberDecorate 88(Task) 2 PerTaskNV
-                              MemberDecorate 88(Task) 2 Offset 32
                               Decorate 88(Task) Block
+                              MemberDecorate 88(Task) 0 Offset 0
+                              MemberDecorate 88(Task) 0 PerTaskNV
+                              MemberDecorate 88(Task) 1 Offset 8
+                              MemberDecorate 88(Task) 1 PerTaskNV
+                              MemberDecorate 88(Task) 2 Offset 32
+                              MemberDecorate 88(Task) 2 PerTaskNV
                               Decorate 90(mytask) Location 0
                               Decorate 113(gl_TaskCountNV) BuiltIn TaskCountNV
                               Decorate 115 BuiltIn WorkgroupSize
diff --git a/Test/baseResults/spv.multiStruct.comp.out b/Test/baseResults/spv.multiStruct.comp.out
index 0ff605cc..af9db966 100644
--- a/Test/baseResults/spv.multiStruct.comp.out
+++ b/Test/baseResults/spv.multiStruct.comp.out
@@ -48,35 +48,35 @@ spv.multiStruct.comp
                               Decorate 15 ArrayStride 8
                               MemberDecorate 16(MyStruct) 0 Offset 0
                               MemberDecorate 16(MyStruct) 1 Offset 16
-                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 17(SSBO0) BufferBlock
-                              Decorate 19(inBuf) DescriptorSet 0
+                              MemberDecorate 17(SSBO0) 0 Offset 0
                               Decorate 19(inBuf) Binding 0
-                              MemberDecorate 39(SSBO1) 0 Offset 0
+                              Decorate 19(inBuf) DescriptorSet 0
                               Decorate 39(SSBO1) BufferBlock
-                              Decorate 41(outBuf) DescriptorSet 0
+                              MemberDecorate 39(SSBO1) 0 Offset 0
                               Decorate 41(outBuf) Binding 1
+                              Decorate 41(outBuf) DescriptorSet 0
                               Decorate 57 ArrayStride 16
                               MemberDecorate 58(MyStruct) 0 Offset 0
                               MemberDecorate 58(MyStruct) 1 Offset 32
-                              MemberDecorate 59(UBO) 0 Offset 0
                               Decorate 59(UBO) Block
-                              Decorate 61(uBuf) DescriptorSet 0
+                              MemberDecorate 59(UBO) 0 Offset 0
                               Decorate 61(uBuf) Binding 2
+                              Decorate 61(uBuf) DescriptorSet 0
                               Decorate 89 ArrayStride 48
                               MemberDecorate 90(Nested) 0 Offset 0
                               MemberDecorate 90(Nested) 1 Offset 16
-                              MemberDecorate 91(UBON) 0 Offset 0
                               Decorate 91(UBON) Block
-                              Decorate 93(uBufN) DescriptorSet 0
+                              MemberDecorate 91(UBON) 0 Offset 0
                               Decorate 93(uBufN) Binding 2
+                              Decorate 93(uBufN) DescriptorSet 0
                               Decorate 125 ArrayStride 24
                               MemberDecorate 126(Nested) 0 Offset 0
                               MemberDecorate 126(Nested) 1 Offset 8
-                              MemberDecorate 127(SSBO1N) 0 Offset 0
                               Decorate 127(SSBO1N) BufferBlock
-                              Decorate 129(outBufN) DescriptorSet 0
+                              MemberDecorate 127(SSBO1N) 0 Offset 0
                               Decorate 129(outBufN) Binding 1
+                              Decorate 129(outBufN) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.multiStructFuncall.frag.out b/Test/baseResults/spv.multiStructFuncall.frag.out
index 50f4b78b..55544dc6 100644
--- a/Test/baseResults/spv.multiStructFuncall.frag.out
+++ b/Test/baseResults/spv.multiStructFuncall.frag.out
@@ -30,12 +30,12 @@ spv.multiStructFuncall.frag
                               Name 50  "param"
                               Name 61  "param"
                               MemberDecorate 22(S) 0 ColMajor
-                              MemberDecorate 22(S) 0 Offset 0
                               MemberDecorate 22(S) 0 MatrixStride 16
-                              MemberDecorate 23(blockName) 0 Offset 0
+                              MemberDecorate 22(S) 0 Offset 0
                               Decorate 23(blockName) BufferBlock
-                              Decorate 25 DescriptorSet 0
+                              MemberDecorate 23(blockName) 0 Offset 0
                               Decorate 25 Binding 0
+                              Decorate 25 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.multiView.frag.out b/Test/baseResults/spv.multiView.frag.out
index c6afe8f6..dd433e80 100644
--- a/Test/baseResults/spv.multiView.frag.out
+++ b/Test/baseResults/spv.multiView.frag.out
@@ -15,8 +15,8 @@ spv.multiView.frag
                               Name 9  "color"
                               Name 12  "gl_ViewIndex"
                               Decorate 9(color) Location 0
-                              Decorate 12(gl_ViewIndex) Flat
                               Decorate 12(gl_ViewIndex) BuiltIn ViewIndex
+                              Decorate 12(gl_ViewIndex) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.multiple.var.same.const.frag.out b/Test/baseResults/spv.multiple.var.same.const.frag.out
new file mode 100644
index 00000000..833c6ace
--- /dev/null
+++ b/Test/baseResults/spv.multiple.var.same.const.frag.out
@@ -0,0 +1,21 @@
+spv.multiple.var.same.const.frag
+// Module Version 10000
+// Generated by (magic number): 8000b
+// Id's are bound by 8
+
+                              Capability Shader
+               1:             ExtInstImport  "GLSL.std.450"
+                              MemoryModel Logical GLSL450
+                              EntryPoint Fragment 4  "main"
+                              ExecutionMode 4 OriginUpperLeft
+                              Source ESSL 320
+                              Name 4  "main"
+                              Decorate 7 RelaxedPrecision
+               2:             TypeVoid
+               3:             TypeFunction 2
+               6:             TypeFloat 32
+               7:    6(float) Constant 897988541
+         4(main):           2 Function None 3
+               5:             Label
+                              Return
+                              FunctionEnd
diff --git a/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out b/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
index 95279512..fa718093 100644
--- a/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
+++ b/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
@@ -25,16 +25,16 @@ spv.multiviewPerViewAttributes.tesc
                               MemberName 27(gl_PerVertex) 3  "gl_CullDistance"
                               MemberName 27(gl_PerVertex) 4  "gl_PositionPerViewNV"
                               Name 31  "gl_in"
+                              Decorate 13(gl_PerVertex) Block
                               MemberDecorate 13(gl_PerVertex) 0 BuiltIn PositionPerViewNV
                               MemberDecorate 13(gl_PerVertex) 1 BuiltIn ViewportMaskPerViewNV
-                              Decorate 13(gl_PerVertex) Block
                               Decorate 19(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 27(gl_PerVertex) Block
                               MemberDecorate 27(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 27(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 27(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 27(gl_PerVertex) 3 BuiltIn CullDistance
                               MemberDecorate 27(gl_PerVertex) 4 BuiltIn PositionPerViewNV
-                              Decorate 27(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.multiviewPerViewAttributes.vert.out b/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
index 8268e5de..c456f022 100644
--- a/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
+++ b/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
@@ -22,11 +22,11 @@ spv.multiviewPerViewAttributes.vert
                               Name 24  ""
                               Decorate 11(gl_ViewportMaskPerViewNV) BuiltIn ViewportMaskPerViewNV
                               Decorate 20(gl_PositionPerViewNV) BuiltIn PositionPerViewNV
+                              Decorate 22(gl_PerVertex) Block
                               MemberDecorate 22(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 22(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 22(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 22(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 22(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.newTexture.frag.out b/Test/baseResults/spv.newTexture.frag.out
index 922e82e7..2bffe8af 100644
--- a/Test/baseResults/spv.newTexture.frag.out
+++ b/Test/baseResults/spv.newTexture.frag.out
@@ -44,53 +44,53 @@ Validation failed
                               Name 271  "usCube"
                               Name 275  "us2DArray"
                               Name 277  "ic4D"
-                              Decorate 13(s2D) DescriptorSet 0
                               Decorate 13(s2D) Binding 0
+                              Decorate 13(s2D) DescriptorSet 0
                               Decorate 17(c2D) Location 1
-                              Decorate 23(sCubeArrayShadow) DescriptorSet 0
                               Decorate 23(sCubeArrayShadow) Binding 5
+                              Decorate 23(sCubeArrayShadow) DescriptorSet 0
                               Decorate 26(c4D) Location 3
                               Decorate 29(c1D) Location 0
-                              Decorate 42(s3D) DescriptorSet 0
                               Decorate 42(s3D) Binding 2
-                              Decorate 51(s2DArray) DescriptorSet 0
+                              Decorate 42(s3D) DescriptorSet 0
                               Decorate 51(s2DArray) Binding 7
+                              Decorate 51(s2DArray) DescriptorSet 0
                               Decorate 55(c3D) Location 2
-                              Decorate 64(s2DShadow) DescriptorSet 0
                               Decorate 64(s2DShadow) Binding 6
+                              Decorate 64(s2DShadow) DescriptorSet 0
                               Decorate 81(ic3D) Flat
                               Decorate 81(ic3D) Location 6
                               Decorate 84(ic1D) Flat
                               Decorate 84(ic1D) Location 4
                               Decorate 92(ic2D) Flat
                               Decorate 92(ic2D) Location 5
-                              Decorate 102(sr) DescriptorSet 0
                               Decorate 102(sr) Binding 1
-                              Decorate 128(sCube) DescriptorSet 0
+                              Decorate 102(sr) DescriptorSet 0
                               Decorate 128(sCube) Binding 3
-                              Decorate 137(s2DArrayShadow) DescriptorSet 0
+                              Decorate 128(sCube) DescriptorSet 0
                               Decorate 137(s2DArrayShadow) Binding 8
-                              Decorate 166(is2D) DescriptorSet 0
+                              Decorate 137(s2DArrayShadow) DescriptorSet 0
                               Decorate 166(is2D) Binding 9
-                              Decorate 202(is3D) DescriptorSet 0
+                              Decorate 166(is2D) DescriptorSet 0
                               Decorate 202(is3D) Binding 10
-                              Decorate 214(isCube) DescriptorSet 0
+                              Decorate 202(is3D) DescriptorSet 0
                               Decorate 214(isCube) Binding 11
-                              Decorate 226(is2DArray) DescriptorSet 0
+                              Decorate 214(isCube) DescriptorSet 0
                               Decorate 226(is2DArray) Binding 12
-                              Decorate 241(sCubeShadow) DescriptorSet 0
+                              Decorate 226(is2DArray) DescriptorSet 0
                               Decorate 241(sCubeShadow) Binding 4
+                              Decorate 241(sCubeShadow) DescriptorSet 0
                               Decorate 247(FragData) Location 0
-                              Decorate 259(is2Dms) DescriptorSet 0
                               Decorate 259(is2Dms) Binding 0
-                              Decorate 263(us2D) DescriptorSet 0
+                              Decorate 259(is2Dms) DescriptorSet 0
                               Decorate 263(us2D) Binding 0
-                              Decorate 267(us3D) DescriptorSet 0
+                              Decorate 263(us2D) DescriptorSet 0
                               Decorate 267(us3D) Binding 0
-                              Decorate 271(usCube) DescriptorSet 0
+                              Decorate 267(us3D) DescriptorSet 0
                               Decorate 271(usCube) Binding 0
-                              Decorate 275(us2DArray) DescriptorSet 0
+                              Decorate 271(usCube) DescriptorSet 0
                               Decorate 275(us2DArray) Binding 0
+                              Decorate 275(us2DArray) DescriptorSet 0
                               Decorate 277(ic4D) Flat
                               Decorate 277(ic4D) Location 7
                2:             TypeVoid
diff --git a/Test/baseResults/spv.noBuiltInLoc.vert.out b/Test/baseResults/spv.noBuiltInLoc.vert.out
index 65ee22a6..c7541bf5 100644
--- a/Test/baseResults/spv.noBuiltInLoc.vert.out
+++ b/Test/baseResults/spv.noBuiltInLoc.vert.out
@@ -26,20 +26,20 @@ spv.noBuiltInLoc.vert
                               Name 34  "gl_InstanceID"
                               Decorate 9(bar) Location 0
                               Decorate 11(foo) Location 0
+                              Decorate 16(gl_PerVertex) Block
                               MemberDecorate 16(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 16(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 16(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 16(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 16(gl_PerVertex) Block
                               Decorate 24(uv1) Location 0
                               Decorate 24(uv1) DescriptorSet 0
                               Decorate 26(uv2) Location 1
                               Decorate 26(uv2) DescriptorSet 0
                               Decorate 29(uv3) Location 2
                               Decorate 29(uv3) DescriptorSet 0
-                              Decorate 31(a_uint) Offset 0
-                              Decorate 31(a_uint) DescriptorSet 0
                               Decorate 31(a_uint) Binding 0
+                              Decorate 31(a_uint) DescriptorSet 0
+                              Decorate 31(a_uint) Offset 0
                               Decorate 33(gl_VertexID) BuiltIn VertexId
                               Decorate 34(gl_InstanceID) BuiltIn InstanceId
                2:             TypeVoid
diff --git a/Test/baseResults/spv.noDeadDecorations.vert.out b/Test/baseResults/spv.noDeadDecorations.vert.out
index 0185eaf3..51814d0c 100644
--- a/Test/baseResults/spv.noDeadDecorations.vert.out
+++ b/Test/baseResults/spv.noDeadDecorations.vert.out
@@ -16,13 +16,13 @@ spv.noDeadDecorations.vert
                               MemberName 20(gl_PerVertex) 1  "gl_PointSize"
                               Name 22  ""
                               Name 26  "param"
-                              Decorate 10(func(f1;) RelaxedPrecision
                               Decorate 9(a) RelaxedPrecision
+                              Decorate 10(func(f1;) RelaxedPrecision
                               Decorate 12 RelaxedPrecision
                               Decorate 13 RelaxedPrecision
+                              Decorate 20(gl_PerVertex) Block
                               MemberDecorate 20(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 20(gl_PerVertex) 1 BuiltIn PointSize
-                              Decorate 20(gl_PerVertex) Block
                               Decorate 26(param) RelaxedPrecision
                               Decorate 27 RelaxedPrecision
                2:             TypeVoid
diff --git a/Test/baseResults/spv.nonuniform.frag.out b/Test/baseResults/spv.nonuniform.frag.out
index 26b020c5..8aa68838 100644
--- a/Test/baseResults/spv.nonuniform.frag.out
+++ b/Test/baseResults/spv.nonuniform.frag.out
@@ -82,65 +82,65 @@ spv.nonuniform.frag
                               Decorate 46 DecorationNonUniformEXT
                               Decorate 48 DecorationNonUniformEXT
                               Decorate 49 DecorationNonUniformEXT
-                              Decorate 53(inputAttachmentDyn) DescriptorSet 0
                               Decorate 53(inputAttachmentDyn) Binding 0
+                              Decorate 53(inputAttachmentDyn) DescriptorSet 0
                               Decorate 53(inputAttachmentDyn) InputAttachmentIndex 0
-                              Decorate 70(uniformTexelBufferDyn) DescriptorSet 0
                               Decorate 70(uniformTexelBufferDyn) Binding 1
-                              Decorate 84(storageTexelBufferDyn) DescriptorSet 0
+                              Decorate 70(uniformTexelBufferDyn) DescriptorSet 0
                               Decorate 84(storageTexelBufferDyn) Binding 2
-                              MemberDecorate 93(uname) 0 Offset 0
+                              Decorate 84(storageTexelBufferDyn) DescriptorSet 0
                               Decorate 93(uname) Block
-                              Decorate 96(uniformBuffer) DescriptorSet 0
+                              MemberDecorate 93(uname) 0 Offset 0
                               Decorate 96(uniformBuffer) Binding 3
+                              Decorate 96(uniformBuffer) DescriptorSet 0
                               Decorate 98(nu_ii) Flat
                               Decorate 98(nu_ii) Location 1
                               Decorate 99 DecorationNonUniformEXT
                               Decorate 101 DecorationNonUniformEXT
                               Decorate 102 DecorationNonUniformEXT
                               Decorate 104 DecorationNonUniformEXT
-                              MemberDecorate 105(bname) 0 Offset 0
                               Decorate 105(bname) BufferBlock
-                              Decorate 108(storageBuffer) DescriptorSet 0
+                              MemberDecorate 105(bname) 0 Offset 0
                               Decorate 108(storageBuffer) Binding 4
+                              Decorate 108(storageBuffer) DescriptorSet 0
                               Decorate 109 DecorationNonUniformEXT
                               Decorate 110 DecorationNonUniformEXT
                               Decorate 111 DecorationNonUniformEXT
                               Decorate 113 DecorationNonUniformEXT
-                              Decorate 118(sampledImage) DescriptorSet 0
                               Decorate 118(sampledImage) Binding 5
+                              Decorate 118(sampledImage) DescriptorSet 0
                               Decorate 119 DecorationNonUniformEXT
                               Decorate 121 DecorationNonUniformEXT
                               Decorate 122 DecorationNonUniformEXT
-                              Decorate 133(storageImage) DescriptorSet 0
                               Decorate 133(storageImage) Binding 6
+                              Decorate 133(storageImage) DescriptorSet 0
                               Decorate 134 DecorationNonUniformEXT
                               Decorate 136 DecorationNonUniformEXT
                               Decorate 137 DecorationNonUniformEXT
-                              Decorate 145(inputAttachment) DescriptorSet 0
                               Decorate 145(inputAttachment) Binding 7
+                              Decorate 145(inputAttachment) DescriptorSet 0
                               Decorate 145(inputAttachment) InputAttachmentIndex 1
                               Decorate 146 DecorationNonUniformEXT
                               Decorate 147 DecorationNonUniformEXT
                               Decorate 148 DecorationNonUniformEXT
-                              Decorate 155(uniformTexelBuffer) DescriptorSet 0
                               Decorate 155(uniformTexelBuffer) Binding 8
+                              Decorate 155(uniformTexelBuffer) DescriptorSet 0
                               Decorate 156 DecorationNonUniformEXT
                               Decorate 157 DecorationNonUniformEXT
                               Decorate 158 DecorationNonUniformEXT
                               Decorate 159 DecorationNonUniformEXT
-                              Decorate 166(storageTexelBuffer) DescriptorSet 0
                               Decorate 166(storageTexelBuffer) Binding 9
+                              Decorate 166(storageTexelBuffer) DescriptorSet 0
                               Decorate 167 DecorationNonUniformEXT
                               Decorate 168 DecorationNonUniformEXT
                               Decorate 169 DecorationNonUniformEXT
-                              Decorate 177(uniformTexArr) DescriptorSet 0
                               Decorate 177(uniformTexArr) Binding 10
+                              Decorate 177(uniformTexArr) DescriptorSet 0
                               Decorate 178 DecorationNonUniformEXT
                               Decorate 180 DecorationNonUniformEXT
                               Decorate 181 DecorationNonUniformEXT
-                              Decorate 184(uniformSampler) DescriptorSet 0
                               Decorate 184(uniformSampler) Binding 11
+                              Decorate 184(uniformSampler) DescriptorSet 0
                               Decorate 188(inTexcoord) Location 2
                               Decorate 194 DecorationNonUniformEXT
                               Decorate 195 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.nonuniform2.frag.out b/Test/baseResults/spv.nonuniform2.frag.out
index b9d64ddc..b5b3dfe2 100644
--- a/Test/baseResults/spv.nonuniform2.frag.out
+++ b/Test/baseResults/spv.nonuniform2.frag.out
@@ -20,8 +20,8 @@ spv.nonuniform2.frag
                               Name 13  "data"
                               Name 16  "rIndex"
                               Decorate 9(FragColor) Location 0
-                              Decorate 13(data) DescriptorSet 0
                               Decorate 13(data) Binding 4
+                              Decorate 13(data) DescriptorSet 0
                               Decorate 16(rIndex) Flat
                               Decorate 16(rIndex) Location 3
                               Decorate 18 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.nonuniform3.frag.out b/Test/baseResults/spv.nonuniform3.frag.out
index 119a6d9b..331c058e 100644
--- a/Test/baseResults/spv.nonuniform3.frag.out
+++ b/Test/baseResults/spv.nonuniform3.frag.out
@@ -19,12 +19,12 @@ spv.nonuniform3.frag
                               Name 16  "Index"
                               Name 23  "uSamp"
                               Decorate 9(FragColor) Location 0
-                              Decorate 13(uTex) DescriptorSet 0
                               Decorate 13(uTex) Binding 0
+                              Decorate 13(uTex) DescriptorSet 0
                               Decorate 16(Index) Flat
                               Decorate 16(Index) Location 0
-                              Decorate 23(uSamp) DescriptorSet 1
                               Decorate 23(uSamp) Binding 0
+                              Decorate 23(uSamp) DescriptorSet 1
                               Decorate 27 DecorationNonUniformEXT
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.nonuniform4.frag.out b/Test/baseResults/spv.nonuniform4.frag.out
index 4442e5f5..a20f64b9 100644
--- a/Test/baseResults/spv.nonuniform4.frag.out
+++ b/Test/baseResults/spv.nonuniform4.frag.out
@@ -18,8 +18,8 @@ spv.nonuniform4.frag
                               Name 4  "main"
                               Name 10  "data"
                               Name 13  "rIndex"
-                              Decorate 10(data) DescriptorSet 0
                               Decorate 10(data) Binding 4
+                              Decorate 10(data) DescriptorSet 0
                               Decorate 13(rIndex) Flat
                               Decorate 13(rIndex) Location 3
                               Decorate 15 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.nonuniform5.frag.out b/Test/baseResults/spv.nonuniform5.frag.out
index abf10c2c..d2f05631 100644
--- a/Test/baseResults/spv.nonuniform5.frag.out
+++ b/Test/baseResults/spv.nonuniform5.frag.out
@@ -21,10 +21,10 @@ spv.nonuniform5.frag
                               Name 13  "ubos"
                               Name 16  "Index"
                               Decorate 9(FragColor) Location 0
-                              MemberDecorate 10(UBO) 0 Offset 0
                               Decorate 10(UBO) Block
-                              Decorate 13(ubos) DescriptorSet 0
+                              MemberDecorate 10(UBO) 0 Offset 0
                               Decorate 13(ubos) Binding 0
+                              Decorate 13(ubos) DescriptorSet 0
                               Decorate 16(Index) Flat
                               Decorate 16(Index) Location 0
                               Decorate 18 DecorationNonUniformEXT
diff --git a/Test/baseResults/spv.nv.dmm-allops.comp.out b/Test/baseResults/spv.nv.dmm-allops.comp.out
index b9807142..68537d4a 100644
--- a/Test/baseResults/spv.nv.dmm-allops.comp.out
+++ b/Test/baseResults/spv.nv.dmm-allops.comp.out
@@ -21,13 +21,13 @@ spv.nv.dmm-allops.comp
                               MemberName 9(block) 1  "op_bary"
                               Name 11  ""
                               Name 16  "as"
+                              Decorate 9(block) Block
                               MemberDecorate 9(block) 0 Offset 0
                               MemberDecorate 9(block) 1 Offset 16
-                              Decorate 9(block) Block
-                              Decorate 11 DescriptorSet 0
                               Decorate 11 Binding 0
-                              Decorate 16(as) DescriptorSet 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 16(as) Binding 1
+                              Decorate 16(as) DescriptorSet 0
                               Decorate 58 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.nv.dmm-allops.mesh.out b/Test/baseResults/spv.nv.dmm-allops.mesh.out
index 9f626c21..f2edf548 100644
--- a/Test/baseResults/spv.nv.dmm-allops.mesh.out
+++ b/Test/baseResults/spv.nv.dmm-allops.mesh.out
@@ -26,13 +26,13 @@ spv.nv.dmm-allops.mesh
                               MemberName 9(block) 1  "op_bary"
                               Name 11  ""
                               Name 16  "as"
+                              Decorate 9(block) Block
                               MemberDecorate 9(block) 0 Offset 0
                               MemberDecorate 9(block) 1 Offset 16
-                              Decorate 9(block) Block
-                              Decorate 11 DescriptorSet 0
                               Decorate 11 Binding 0
-                              Decorate 16(as) DescriptorSet 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 16(as) Binding 1
+                              Decorate 16(as) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nv.dmm-allops.rahit.out b/Test/baseResults/spv.nv.dmm-allops.rahit.out
index 388ab04e..56551195 100644
--- a/Test/baseResults/spv.nv.dmm-allops.rahit.out
+++ b/Test/baseResults/spv.nv.dmm-allops.rahit.out
@@ -26,19 +26,19 @@ spv.nv.dmm-allops.rahit
                               Name 64  "gl_HitKindFrontFacingMicroTriangleNV"
                               Name 67  "gl_HitKindBackFacingMicroTriangleNV"
                               Name 76  "as"
+                              Decorate 10(block) Block
                               MemberDecorate 10(block) 0 Offset 0
                               MemberDecorate 10(block) 1 Offset 16
                               MemberDecorate 10(block) 2 Offset 24
-                              Decorate 10(block) Block
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 18(gl_HitMicroTriangleVertexPositionsNV) BuiltIn HitMicroTriangleVertexPositionsNV
                               Decorate 40(gl_HitMicroTriangleVertexBarycentricsNV) BuiltIn HitMicroTriangleVertexBarycentricsNV
                               Decorate 59(gl_HitKindEXT) BuiltIn HitKindKHR
                               Decorate 64(gl_HitKindFrontFacingMicroTriangleNV) BuiltIn HitKindFrontFacingMicroTriangleNV
                               Decorate 67(gl_HitKindBackFacingMicroTriangleNV) BuiltIn HitKindBackFacingMicroTriangleNV
-                              Decorate 76(as) DescriptorSet 0
                               Decorate 76(as) Binding 1
+                              Decorate 76(as) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nv.dmm-allops.rchit.out b/Test/baseResults/spv.nv.dmm-allops.rchit.out
index c53bc8c1..291b5148 100644
--- a/Test/baseResults/spv.nv.dmm-allops.rchit.out
+++ b/Test/baseResults/spv.nv.dmm-allops.rchit.out
@@ -26,19 +26,19 @@ spv.nv.dmm-allops.rchit
                               Name 64  "gl_HitKindFrontFacingMicroTriangleNV"
                               Name 67  "gl_HitKindBackFacingMicroTriangleNV"
                               Name 76  "as"
+                              Decorate 10(block) Block
                               MemberDecorate 10(block) 0 Offset 0
                               MemberDecorate 10(block) 1 Offset 16
                               MemberDecorate 10(block) 2 Offset 24
-                              Decorate 10(block) Block
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 18(gl_HitMicroTriangleVertexPositionsNV) BuiltIn HitMicroTriangleVertexPositionsNV
                               Decorate 40(gl_HitMicroTriangleVertexBarycentricsNV) BuiltIn HitMicroTriangleVertexBarycentricsNV
                               Decorate 59(gl_HitKindEXT) BuiltIn HitKindKHR
                               Decorate 64(gl_HitKindFrontFacingMicroTriangleNV) BuiltIn HitKindFrontFacingMicroTriangleNV
                               Decorate 67(gl_HitKindBackFacingMicroTriangleNV) BuiltIn HitKindBackFacingMicroTriangleNV
-                              Decorate 76(as) DescriptorSet 0
                               Decorate 76(as) Binding 1
+                              Decorate 76(as) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nv.dmm-allops.rgen.out b/Test/baseResults/spv.nv.dmm-allops.rgen.out
index 78001e1f..aaff10ff 100644
--- a/Test/baseResults/spv.nv.dmm-allops.rgen.out
+++ b/Test/baseResults/spv.nv.dmm-allops.rgen.out
@@ -23,14 +23,14 @@ spv.nv.dmm-allops.rgen
                               Name 17  "as"
                               Name 58  "gl_HitKindFrontFacingMicroTriangleNV"
                               Name 61  "gl_HitKindBackFacingMicroTriangleNV"
+                              Decorate 10(block) Block
                               MemberDecorate 10(block) 0 Offset 0
                               MemberDecorate 10(block) 1 Offset 16
                               MemberDecorate 10(block) 2 Offset 24
-                              Decorate 10(block) Block
-                              Decorate 12 DescriptorSet 0
                               Decorate 12 Binding 0
-                              Decorate 17(as) DescriptorSet 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 17(as) Binding 1
+                              Decorate 17(as) DescriptorSet 0
                               Decorate 58(gl_HitKindFrontFacingMicroTriangleNV) BuiltIn HitKindFrontFacingMicroTriangleNV
                               Decorate 61(gl_HitKindBackFacingMicroTriangleNV) BuiltIn HitKindBackFacingMicroTriangleNV
                2:             TypeVoid
diff --git a/Test/baseResults/spv.nv.hitobject-allops.rchit.out b/Test/baseResults/spv.nv.hitobject-allops.rchit.out
index 15e6d416..0ab305c3 100644
--- a/Test/baseResults/spv.nv.hitobject-allops.rchit.out
+++ b/Test/baseResults/spv.nv.hitobject-allops.rchit.out
@@ -48,13 +48,13 @@ spv.nv.hitobject-allops.rchit
                               Name 112  "handle"
                               Name 114  "rid"
                               Decorate 12(hBlock) Block
-                              Decorate 25(as) DescriptorSet 0
                               Decorate 25(as) Binding 0
+                              Decorate 25(as) DescriptorSet 0
                               Decorate 40(pBlock) Block
-                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 62(block) Block
-                              Decorate 64 DescriptorSet 0
+                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 64 Binding 1
+                              Decorate 64 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nv.hitobject-allops.rgen.out b/Test/baseResults/spv.nv.hitobject-allops.rgen.out
index d395500a..c6811118 100644
--- a/Test/baseResults/spv.nv.hitobject-allops.rgen.out
+++ b/Test/baseResults/spv.nv.hitobject-allops.rgen.out
@@ -48,13 +48,13 @@ spv.nv.hitobject-allops.rgen
                               Name 112  "handle"
                               Name 114  "rid"
                               Decorate 12(hBlock) Block
-                              Decorate 25(as) DescriptorSet 0
                               Decorate 25(as) Binding 0
+                              Decorate 25(as) DescriptorSet 0
                               Decorate 40(pBlock) Block
-                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 62(block) Block
-                              Decorate 64 DescriptorSet 0
+                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 64 Binding 1
+                              Decorate 64 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nv.hitobject-allops.rmiss.out b/Test/baseResults/spv.nv.hitobject-allops.rmiss.out
index 970d08a1..4ad23a55 100644
--- a/Test/baseResults/spv.nv.hitobject-allops.rmiss.out
+++ b/Test/baseResults/spv.nv.hitobject-allops.rmiss.out
@@ -48,13 +48,13 @@ spv.nv.hitobject-allops.rmiss
                               Name 112  "handle"
                               Name 114  "rid"
                               Decorate 12(hBlock) Block
-                              Decorate 25(as) DescriptorSet 0
                               Decorate 25(as) Binding 0
+                              Decorate 25(as) DescriptorSet 0
                               Decorate 40(pBlock) Block
-                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 62(block) Block
-                              Decorate 64 DescriptorSet 0
+                              MemberDecorate 62(block) 0 Offset 0
                               Decorate 64 Binding 1
+                              Decorate 64 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.nvAtomicFp16Vec.frag.out b/Test/baseResults/spv.nvAtomicFp16Vec.frag.out
index 3486cf3d..76d683e4 100644
--- a/Test/baseResults/spv.nvAtomicFp16Vec.frag.out
+++ b/Test/baseResults/spv.nvAtomicFp16Vec.frag.out
@@ -42,69 +42,69 @@ spv.nvAtomicFp16Vec.frag
                               Name 340  "fimageCubev4"
                               Name 350  "fimageCubeArrayv4"
                               Name 360  "fimage3Dv4"
+                              Decorate 9(Buffer) BufferBlock
                               MemberDecorate 9(Buffer) 0 Offset 0
                               MemberDecorate 9(Buffer) 1 Offset 8
                               MemberDecorate 9(Buffer) 2 Offset 16
                               MemberDecorate 9(Buffer) 3 Offset 24
-                              Decorate 9(Buffer) BufferBlock
-                              Decorate 11(buf) DescriptorSet 0
                               Decorate 11(buf) Binding 0
-                              Decorate 74(fimage1D) DescriptorSet 0
-                              Decorate 74(fimage1D) Binding 0
+                              Decorate 11(buf) DescriptorSet 0
                               Decorate 74(fimage1D) Volatile
                               Decorate 74(fimage1D) Coherent
-                              Decorate 85(fimage1DArray) DescriptorSet 0
-                              Decorate 85(fimage1DArray) Binding 1
+                              Decorate 74(fimage1D) Binding 0
+                              Decorate 74(fimage1D) DescriptorSet 0
                               Decorate 85(fimage1DArray) Volatile
                               Decorate 85(fimage1DArray) Coherent
-                              Decorate 97(fimage2D) DescriptorSet 0
-                              Decorate 97(fimage2D) Binding 2
+                              Decorate 85(fimage1DArray) Binding 1
+                              Decorate 85(fimage1DArray) DescriptorSet 0
                               Decorate 97(fimage2D) Volatile
                               Decorate 97(fimage2D) Coherent
-                              Decorate 107(fimage2DArray) DescriptorSet 0
-                              Decorate 107(fimage2DArray) Binding 3
+                              Decorate 97(fimage2D) Binding 2
+                              Decorate 97(fimage2D) DescriptorSet 0
                               Decorate 107(fimage2DArray) Volatile
                               Decorate 107(fimage2DArray) Coherent
-                              Decorate 119(fimageCube) DescriptorSet 0
-                              Decorate 119(fimageCube) Binding 5
+                              Decorate 107(fimage2DArray) Binding 3
+                              Decorate 107(fimage2DArray) DescriptorSet 0
                               Decorate 119(fimageCube) Volatile
                               Decorate 119(fimageCube) Coherent
-                              Decorate 129(fimageCubeArray) DescriptorSet 0
-                              Decorate 129(fimageCubeArray) Binding 6
+                              Decorate 119(fimageCube) Binding 5
+                              Decorate 119(fimageCube) DescriptorSet 0
                               Decorate 129(fimageCubeArray) Volatile
                               Decorate 129(fimageCubeArray) Coherent
-                              Decorate 139(fimage3D) DescriptorSet 0
-                              Decorate 139(fimage3D) Binding 9
+                              Decorate 129(fimageCubeArray) Binding 6
+                              Decorate 129(fimageCubeArray) DescriptorSet 0
                               Decorate 139(fimage3D) Volatile
                               Decorate 139(fimage3D) Coherent
-                              Decorate 299(fimage1Dv4) DescriptorSet 0
-                              Decorate 299(fimage1Dv4) Binding 10
+                              Decorate 139(fimage3D) Binding 9
+                              Decorate 139(fimage3D) DescriptorSet 0
                               Decorate 299(fimage1Dv4) Volatile
                               Decorate 299(fimage1Dv4) Coherent
-                              Decorate 310(fimage1DArrayv4) DescriptorSet 0
-                              Decorate 310(fimage1DArrayv4) Binding 11
+                              Decorate 299(fimage1Dv4) Binding 10
+                              Decorate 299(fimage1Dv4) DescriptorSet 0
                               Decorate 310(fimage1DArrayv4) Volatile
                               Decorate 310(fimage1DArrayv4) Coherent
-                              Decorate 320(fimage2Dv4) DescriptorSet 0
-                              Decorate 320(fimage2Dv4) Binding 12
+                              Decorate 310(fimage1DArrayv4) Binding 11
+                              Decorate 310(fimage1DArrayv4) DescriptorSet 0
                               Decorate 320(fimage2Dv4) Volatile
                               Decorate 320(fimage2Dv4) Coherent
-                              Decorate 330(fimage2DArrayv4) DescriptorSet 0
-                              Decorate 330(fimage2DArrayv4) Binding 13
+                              Decorate 320(fimage2Dv4) Binding 12
+                              Decorate 320(fimage2Dv4) DescriptorSet 0
                               Decorate 330(fimage2DArrayv4) Volatile
                               Decorate 330(fimage2DArrayv4) Coherent
-                              Decorate 340(fimageCubev4) DescriptorSet 0
-                              Decorate 340(fimageCubev4) Binding 15
+                              Decorate 330(fimage2DArrayv4) Binding 13
+                              Decorate 330(fimage2DArrayv4) DescriptorSet 0
                               Decorate 340(fimageCubev4) Volatile
                               Decorate 340(fimageCubev4) Coherent
-                              Decorate 350(fimageCubeArrayv4) DescriptorSet 0
-                              Decorate 350(fimageCubeArrayv4) Binding 16
+                              Decorate 340(fimageCubev4) Binding 15
+                              Decorate 340(fimageCubev4) DescriptorSet 0
                               Decorate 350(fimageCubeArrayv4) Volatile
                               Decorate 350(fimageCubeArrayv4) Coherent
-                              Decorate 360(fimage3Dv4) DescriptorSet 0
-                              Decorate 360(fimage3Dv4) Binding 19
+                              Decorate 350(fimageCubeArrayv4) Binding 16
+                              Decorate 350(fimageCubeArrayv4) DescriptorSet 0
                               Decorate 360(fimage3Dv4) Volatile
                               Decorate 360(fimage3Dv4) Coherent
+                              Decorate 360(fimage3Dv4) Binding 19
+                              Decorate 360(fimage3Dv4) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 16
diff --git a/Test/baseResults/spv.offsets.frag.out b/Test/baseResults/spv.offsets.frag.out
index d753f2f0..b6f826ef 100644
--- a/Test/baseResults/spv.offsets.frag.out
+++ b/Test/baseResults/spv.offsets.frag.out
@@ -22,20 +22,20 @@ spv.offsets.frag
                               MemberName 12(n2) 2  "g"
                               MemberName 12(n2) 3  "h"
                               Name 14  "i2"
+                              Decorate 7(n1) Block
                               MemberDecorate 7(n1) 0 Offset 8
                               MemberDecorate 7(n1) 1 Offset 4
                               MemberDecorate 7(n1) 2 Offset 0
                               MemberDecorate 7(n1) 3 Offset 12
-                              Decorate 7(n1) Block
-                              Decorate 9(i1) DescriptorSet 0
                               Decorate 9(i1) Binding 0
+                              Decorate 9(i1) DescriptorSet 0
+                              Decorate 12(n2) BufferBlock
                               MemberDecorate 12(n2) 0 Offset 32
                               MemberDecorate 12(n2) 1 Offset 48
                               MemberDecorate 12(n2) 2 Offset 16
                               MemberDecorate 12(n2) 3 Offset 0
-                              Decorate 12(n2) BufferBlock
-                              Decorate 14(i2) DescriptorSet 0
                               Decorate 14(i2) Binding 1
+                              Decorate 14(i2) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.paramMemory.420.frag.out b/Test/baseResults/spv.paramMemory.420.frag.out
index bc11df4f..d533ec72 100644
--- a/Test/baseResults/spv.paramMemory.420.frag.out
+++ b/Test/baseResults/spv.paramMemory.420.frag.out
@@ -41,20 +41,20 @@ Validation failed
                               Decorate 20(image) NonReadable
                               Decorate 27(in_coords) Flat
                               Decorate 27(in_coords) Location 0
-                              Decorate 36(image1) DescriptorSet 0
-                              Decorate 36(image1) Binding 0
                               Decorate 36(image1) Coherent
                               Decorate 36(image1) NonWritable
-                              Decorate 41(image2) DescriptorSet 0
-                              Decorate 41(image2) Binding 2
+                              Decorate 36(image1) Binding 0
+                              Decorate 36(image1) DescriptorSet 0
                               Decorate 41(image2) NonWritable
-                              Decorate 47(image3) DescriptorSet 0
-                              Decorate 47(image3) Binding 1
+                              Decorate 41(image2) Binding 2
+                              Decorate 41(image2) DescriptorSet 0
                               Decorate 47(image3) Coherent
                               Decorate 47(image3) NonReadable
-                              Decorate 57(image4) DescriptorSet 0
-                              Decorate 57(image4) Binding 3
+                              Decorate 47(image3) Binding 1
+                              Decorate 47(image3) DescriptorSet 0
                               Decorate 57(image4) NonReadable
+                              Decorate 57(image4) Binding 3
+                              Decorate 57(image4) DescriptorSet 0
                               Decorate 66(out_color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.paramMemory.frag.out b/Test/baseResults/spv.paramMemory.frag.out
index ebb2ccbb..ccca4024 100644
--- a/Test/baseResults/spv.paramMemory.frag.out
+++ b/Test/baseResults/spv.paramMemory.frag.out
@@ -36,13 +36,13 @@ Validation failed
                               Decorate 20(image) NonReadable
                               Decorate 27(in_coords) Flat
                               Decorate 27(in_coords) Location 0
-                              Decorate 43(image3) DescriptorSet 0
-                              Decorate 43(image3) Binding 1
                               Decorate 43(image3) Coherent
                               Decorate 43(image3) NonReadable
-                              Decorate 52(image4) DescriptorSet 0
-                              Decorate 52(image4) Binding 3
+                              Decorate 43(image3) Binding 1
+                              Decorate 43(image3) DescriptorSet 0
                               Decorate 52(image4) NonReadable
+                              Decorate 52(image4) Binding 3
+                              Decorate 52(image4) DescriptorSet 0
                               Decorate 61(out_color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.perprimitiveNV.frag.out b/Test/baseResults/spv.perprimitiveNV.frag.out
index 079a5f47..b319ec05 100644
--- a/Test/baseResults/spv.perprimitiveNV.frag.out
+++ b/Test/baseResults/spv.perprimitiveNV.frag.out
@@ -21,12 +21,12 @@ spv.perprimitiveNV.frag
                               MemberName 17(C) 0  "h"
                               Name 19  ""
                               Decorate 8(g) Location 8
-                              MemberDecorate 9(B) 0 PerPrimitiveNV
                               Decorate 9(B) Block
+                              MemberDecorate 9(B) 0 PerPrimitiveNV
                               Decorate 11 Location 0
+                              Decorate 17(C) Block
                               MemberDecorate 17(C) 0 Flat
                               MemberDecorate 17(C) 0 Centroid
-                              Decorate 17(C) Block
                               Decorate 19 Location 4
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.pp.line.frag.out b/Test/baseResults/spv.pp.line.frag.out
index 7218254d..af73d175 100644
--- a/Test/baseResults/spv.pp.line.frag.out
+++ b/Test/baseResults/spv.pp.line.frag.out
@@ -74,10 +74,10 @@ void main()
                               Name 72  "gl_FragColor"
                               Name 75  "u"
                               Name 78  "blend"
-                              Decorate 41(texSampler1D) DescriptorSet 0
                               Decorate 41(texSampler1D) Binding 0
-                              Decorate 56(texSampler2D) DescriptorSet 0
+                              Decorate 41(texSampler1D) DescriptorSet 0
                               Decorate 56(texSampler2D) Binding 1
+                              Decorate 56(texSampler2D) DescriptorSet 0
                               Decorate 60(coords2D) Location 2
                               Decorate 72(gl_FragColor) Location 0
                               Decorate 75(u) Location 1
diff --git a/Test/baseResults/spv.precise.tesc.out b/Test/baseResults/spv.precise.tesc.out
index 84617cae..93d1d982 100644
--- a/Test/baseResults/spv.precise.tesc.out
+++ b/Test/baseResults/spv.precise.tesc.out
@@ -22,10 +22,10 @@ spv.precise.tesc
                               Decorate 12(in_te_position) Location 0
                               Decorate 15(gl_InvocationID) BuiltIn InvocationId
                               Decorate 20(in_tc_position) Location 0
-                              Decorate 30(gl_TessLevelInner) Patch
                               Decorate 30(gl_TessLevelInner) BuiltIn TessLevelInner
-                              Decorate 40(gl_TessLevelOuter) Patch
+                              Decorate 30(gl_TessLevelInner) Patch
                               Decorate 40(gl_TessLevelOuter) BuiltIn TessLevelOuter
+                              Decorate 40(gl_TessLevelOuter) Patch
                               Decorate 45(in_tc_tessParam) Location 1
                               Decorate 52 NoContraction
                               Decorate 53 NoContraction
diff --git a/Test/baseResults/spv.precise.tese.out b/Test/baseResults/spv.precise.tese.out
index 6fe183d2..d9b7141c 100644
--- a/Test/baseResults/spv.precise.tese.out
+++ b/Test/baseResults/spv.precise.tese.out
@@ -41,9 +41,9 @@ spv.precise.tese
                               Decorate 101 NoContraction
                               Decorate 106 NoContraction
                               Decorate 109 NoContraction
+                              Decorate 110(gl_PerVertex) Block
                               MemberDecorate 110(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 110(gl_PerVertex) 1 BuiltIn PointSize
-                              Decorate 110(gl_PerVertex) Block
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.precision.frag.out b/Test/baseResults/spv.precision.frag.out
index 8144dfbf..0cdba716 100644
--- a/Test/baseResults/spv.precision.frag.out
+++ b/Test/baseResults/spv.precision.frag.out
@@ -35,8 +35,8 @@ spv.precision.frag
                               MemberName 117(S) 1  "b"
                               Name 119  "s"
                               Name 149  "gl_SampleMaskIn"
-                              Decorate 12(foo(vf3;) RelaxedPrecision
                               Decorate 11(mv3) RelaxedPrecision
+                              Decorate 12(foo(vf3;) RelaxedPrecision
                               Decorate 23(highfin) Location 2
                               Decorate 27 RelaxedPrecision
                               Decorate 28 RelaxedPrecision
@@ -99,8 +99,8 @@ spv.precision.frag
                               Decorate 143 RelaxedPrecision
                               Decorate 144 RelaxedPrecision
                               Decorate 145 RelaxedPrecision
-                              Decorate 149(gl_SampleMaskIn) Flat
                               Decorate 149(gl_SampleMaskIn) BuiltIn SampleMask
+                              Decorate 149(gl_SampleMaskIn) Flat
                               Decorate 153 RelaxedPrecision
                               Decorate 156 RelaxedPrecision
                               Decorate 159 RelaxedPrecision
diff --git a/Test/baseResults/spv.precisionArgs.frag.out b/Test/baseResults/spv.precisionArgs.frag.out
index a35b1d3c..3cc72c36 100644
--- a/Test/baseResults/spv.precisionArgs.frag.out
+++ b/Test/baseResults/spv.precisionArgs.frag.out
@@ -40,8 +40,8 @@ spv.precisionArgs.frag
                               Name 80  "param"
                               Decorate 8(f) RelaxedPrecision
                               Decorate 14(f) RelaxedPrecision
-                              Decorate 20(retM(f1;) RelaxedPrecision
                               Decorate 19(x) RelaxedPrecision
+                              Decorate 20(retM(f1;) RelaxedPrecision
                               Decorate 26(retHM(f1;) RelaxedPrecision
                               Decorate 28(x) RelaxedPrecision
                               Decorate 31 RelaxedPrecision
diff --git a/Test/baseResults/spv.precisionNonESSamp.frag.out b/Test/baseResults/spv.precisionNonESSamp.frag.out
index 40ca536b..d082bee0 100644
--- a/Test/baseResults/spv.precisionNonESSamp.frag.out
+++ b/Test/baseResults/spv.precisionNonESSamp.frag.out
@@ -23,22 +23,22 @@ spv.precisionNonESSamp.frag
                               Decorate 9(color) RelaxedPrecision
                               Decorate 9(color) Location 0
                               Decorate 13(s) RelaxedPrecision
-                              Decorate 13(s) DescriptorSet 0
                               Decorate 13(s) Binding 0
+                              Decorate 13(s) DescriptorSet 0
                               Decorate 14 RelaxedPrecision
                               Decorate 17(v2) RelaxedPrecision
                               Decorate 17(v2) Location 0
                               Decorate 18 RelaxedPrecision
                               Decorate 19 RelaxedPrecision
-                              Decorate 23(t) DescriptorSet 0
                               Decorate 23(t) Binding 1
+                              Decorate 23(t) DescriptorSet 0
                               Decorate 27(v3) RelaxedPrecision
                               Decorate 27(v3) Location 1
                               Decorate 28 RelaxedPrecision
                               Decorate 31(vi1) RelaxedPrecision
                               Decorate 34(i1) RelaxedPrecision
-                              Decorate 34(i1) DescriptorSet 0
                               Decorate 34(i1) Binding 2
+                              Decorate 34(i1) DescriptorSet 0
                               Decorate 35 RelaxedPrecision
                               Decorate 39(iv2) RelaxedPrecision
                               Decorate 39(iv2) Flat
@@ -46,8 +46,8 @@ spv.precisionNonESSamp.frag
                               Decorate 40 RelaxedPrecision
                               Decorate 41 RelaxedPrecision
                               Decorate 42(vi2) RelaxedPrecision
-                              Decorate 43(i2) DescriptorSet 0
                               Decorate 43(i2) Binding 3
+                              Decorate 43(i2) DescriptorSet 0
                               Decorate 45 RelaxedPrecision
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.precisionTexture.frag.out b/Test/baseResults/spv.precisionTexture.frag.out
index e46b2d79..19aa6564 100644
--- a/Test/baseResults/spv.precisionTexture.frag.out
+++ b/Test/baseResults/spv.precisionTexture.frag.out
@@ -20,28 +20,28 @@ spv.precisionTexture.frag
                               Name 65  "fragColor"
                               Decorate 9(v) RelaxedPrecision
                               Decorate 13(texM) RelaxedPrecision
-                              Decorate 13(texM) DescriptorSet 0
                               Decorate 13(texM) Binding 0
+                              Decorate 13(texM) DescriptorSet 0
                               Decorate 14 RelaxedPrecision
                               Decorate 16(vertex) Location 0
                               Decorate 20 RelaxedPrecision
-                              Decorate 21(texH) DescriptorSet 0
                               Decorate 21(texH) Binding 1
+                              Decorate 21(texH) DescriptorSet 0
                               Decorate 26 RelaxedPrecision
                               Decorate 34 RelaxedPrecision
                               Decorate 41 RelaxedPrecision
                               Decorate 45 RelaxedPrecision
                               Decorate 52(imageM) RelaxedPrecision
-                              Decorate 52(imageM) DescriptorSet 0
-                              Decorate 52(imageM) Binding 0
                               Decorate 52(imageM) NonWritable
+                              Decorate 52(imageM) Binding 0
+                              Decorate 52(imageM) DescriptorSet 0
                               Decorate 53 RelaxedPrecision
                               Decorate 57(coord) Flat
                               Decorate 57(coord) Location 1
                               Decorate 59 RelaxedPrecision
-                              Decorate 60(imageH) DescriptorSet 0
-                              Decorate 60(imageH) Binding 1
                               Decorate 60(imageH) NonWritable
+                              Decorate 60(imageH) Binding 1
+                              Decorate 60(imageH) DescriptorSet 0
                               Decorate 65(fragColor) RelaxedPrecision
                               Decorate 65(fragColor) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.pushConstant.vert.out b/Test/baseResults/spv.pushConstant.vert.out
index f6df47d5..cd825002 100644
--- a/Test/baseResults/spv.pushConstant.vert.out
+++ b/Test/baseResults/spv.pushConstant.vert.out
@@ -15,9 +15,9 @@ spv.pushConstant.vert
                               Name 13  "matInst"
                               Name 24  "color"
                               Decorate 10 ArrayStride 4
+                              Decorate 11(Material) Block
                               MemberDecorate 11(Material) 0 Offset 0
                               MemberDecorate 11(Material) 1 Offset 4
-                              Decorate 11(Material) Block
                               Decorate 24(color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.pushConstantAnon.vert.out b/Test/baseResults/spv.pushConstantAnon.vert.out
index ca7d345b..eddb77a9 100644
--- a/Test/baseResults/spv.pushConstantAnon.vert.out
+++ b/Test/baseResults/spv.pushConstantAnon.vert.out
@@ -15,9 +15,9 @@ spv.pushConstantAnon.vert
                               Name 13  ""
                               Name 24  "color"
                               Decorate 10 ArrayStride 4
+                              Decorate 11(Material) Block
                               MemberDecorate 11(Material) 0 Offset 0
                               MemberDecorate 11(Material) 1 Offset 4
-                              Decorate 11(Material) Block
                               Decorate 24(color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.queryL.frag.out b/Test/baseResults/spv.queryL.frag.out
index 1e18387d..1b3c63ec 100644
--- a/Test/baseResults/spv.queryL.frag.out
+++ b/Test/baseResults/spv.queryL.frag.out
@@ -41,46 +41,46 @@ Validation failed
                               Name 182  "usampCubeA"
                               Name 219  "sampBuf"
                               Name 223  "sampRect"
-                              Decorate 13(samp1D) DescriptorSet 0
                               Decorate 13(samp1D) Binding 0
-                              Decorate 23(isamp2D) DescriptorSet 0
+                              Decorate 13(samp1D) DescriptorSet 0
                               Decorate 23(isamp2D) Binding 1
-                              Decorate 34(usamp3D) DescriptorSet 0
+                              Decorate 23(isamp2D) DescriptorSet 0
                               Decorate 34(usamp3D) Binding 4
-                              Decorate 46(sampCube) DescriptorSet 0
+                              Decorate 34(usamp3D) DescriptorSet 0
                               Decorate 46(sampCube) Binding 5
-                              Decorate 55(isamp1DA) DescriptorSet 0
+                              Decorate 46(sampCube) DescriptorSet 0
                               Decorate 55(isamp1DA) Binding 7
-                              Decorate 64(usamp2DA) DescriptorSet 0
+                              Decorate 55(isamp1DA) DescriptorSet 0
                               Decorate 64(usamp2DA) Binding 9
-                              Decorate 73(isampCubeA) DescriptorSet 0
+                              Decorate 64(usamp2DA) DescriptorSet 0
                               Decorate 73(isampCubeA) Binding 10
-                              Decorate 82(samp1Ds) DescriptorSet 0
+                              Decorate 73(isampCubeA) DescriptorSet 0
                               Decorate 82(samp1Ds) Binding 12
-                              Decorate 91(samp2Ds) DescriptorSet 0
+                              Decorate 82(samp1Ds) DescriptorSet 0
                               Decorate 91(samp2Ds) Binding 13
-                              Decorate 100(sampCubes) DescriptorSet 0
+                              Decorate 91(samp2Ds) DescriptorSet 0
                               Decorate 100(sampCubes) Binding 14
-                              Decorate 109(samp1DAs) DescriptorSet 0
+                              Decorate 100(sampCubes) DescriptorSet 0
                               Decorate 109(samp1DAs) Binding 15
-                              Decorate 118(samp2DAs) DescriptorSet 0
+                              Decorate 109(samp1DAs) DescriptorSet 0
                               Decorate 118(samp2DAs) Binding 16
-                              Decorate 127(sampCubeAs) DescriptorSet 0
+                              Decorate 118(samp2DAs) DescriptorSet 0
                               Decorate 127(sampCubeAs) Binding 17
-                              Decorate 141(usamp2D) DescriptorSet 0
+                              Decorate 127(sampCubeAs) DescriptorSet 0
                               Decorate 141(usamp2D) Binding 2
-                              Decorate 150(isamp3D) DescriptorSet 0
+                              Decorate 141(usamp2D) DescriptorSet 0
                               Decorate 150(isamp3D) Binding 3
-                              Decorate 159(isampCube) DescriptorSet 0
+                              Decorate 150(isamp3D) DescriptorSet 0
                               Decorate 159(isampCube) Binding 6
-                              Decorate 173(samp2DA) DescriptorSet 0
+                              Decorate 159(isampCube) DescriptorSet 0
                               Decorate 173(samp2DA) Binding 8
-                              Decorate 182(usampCubeA) DescriptorSet 0
+                              Decorate 173(samp2DA) DescriptorSet 0
                               Decorate 182(usampCubeA) Binding 11
-                              Decorate 219(sampBuf) DescriptorSet 0
+                              Decorate 182(usampCubeA) DescriptorSet 0
                               Decorate 219(sampBuf) Binding 0
-                              Decorate 223(sampRect) DescriptorSet 0
+                              Decorate 219(sampBuf) DescriptorSet 0
                               Decorate 223(sampRect) Binding 0
+                              Decorate 223(sampRect) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.queueFamilyScope.comp.out b/Test/baseResults/spv.queueFamilyScope.comp.out
index 49a59a38..565269c4 100644
--- a/Test/baseResults/spv.queueFamilyScope.comp.out
+++ b/Test/baseResults/spv.queueFamilyScope.comp.out
@@ -16,10 +16,10 @@ spv.queueFamilyScope.comp
                               Name 7  "Buffer"
                               MemberName 7(Buffer) 0  "a"
                               Name 9  "A"
-                              MemberDecorate 7(Buffer) 0 Offset 0
                               Decorate 7(Buffer) Block
-                              Decorate 9(A) DescriptorSet 0
+                              MemberDecorate 7(Buffer) 0 Offset 0
                               Decorate 9(A) Binding 0
+                              Decorate 9(A) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.rankShift.comp.out b/Test/baseResults/spv.rankShift.comp.out
index cecde795..a091ec1b 100644
--- a/Test/baseResults/spv.rankShift.comp.out
+++ b/Test/baseResults/spv.rankShift.comp.out
@@ -16,11 +16,11 @@ spv.rankShift.comp
                               Name 11  "arg0"
                               Name 15  "arg1"
                               Decorate 11(arg0) Location 4
-                              Decorate 11(arg0) DescriptorSet 0
                               Decorate 11(arg0) Binding 0
+                              Decorate 11(arg0) DescriptorSet 0
                               Decorate 15(arg1) Location 5
-                              Decorate 15(arg1) DescriptorSet 0
                               Decorate 15(arg1) Binding 1
+                              Decorate 15(arg1) DescriptorSet 0
                               Decorate 32 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.register.autoassign-2.frag.out b/Test/baseResults/spv.register.autoassign-2.frag.out
index 61d920c2..a921f10d 100644
--- a/Test/baseResults/spv.register.autoassign-2.frag.out
+++ b/Test/baseResults/spv.register.autoassign-2.frag.out
@@ -20,12 +20,12 @@ spv.register.autoassign-2.frag
                               Name 39  "psout"
                               Name 40  "param"
                               Name 44  "psout.Color"
-                              Decorate 18(g_tScene[0]) DescriptorSet 0
                               Decorate 18(g_tScene[0]) Binding 10
-                              Decorate 22(g_tSamp) DescriptorSet 0
+                              Decorate 18(g_tScene[0]) DescriptorSet 0
                               Decorate 22(g_tSamp) Binding 5
-                              Decorate 31(g_tScene[1]) DescriptorSet 0
+                              Decorate 22(g_tSamp) DescriptorSet 0
                               Decorate 31(g_tScene[1]) Binding 11
+                              Decorate 31(g_tScene[1]) DescriptorSet 0
                               Decorate 44(psout.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.register.autoassign.frag.out b/Test/baseResults/spv.register.autoassign.frag.out
index b4db04e6..be86a861 100644
--- a/Test/baseResults/spv.register.autoassign.frag.out
+++ b/Test/baseResults/spv.register.autoassign.frag.out
@@ -44,47 +44,47 @@ spv.register.autoassign.frag
                               Name 141  "psout"
                               Name 151  "@entryPointOutput.Color"
                               Name 154  "g_tTex_unused3"
-                              Decorate 21(g_tTex1) DescriptorSet 0
                               Decorate 21(g_tTex1) Binding 11
-                              Decorate 25(g_sSamp1) DescriptorSet 0
+                              Decorate 21(g_tTex1) DescriptorSet 0
                               Decorate 25(g_sSamp1) Binding 5
-                              Decorate 31(g_tTex2) DescriptorSet 0
+                              Decorate 25(g_sSamp1) DescriptorSet 0
                               Decorate 31(g_tTex2) Binding 14
-                              Decorate 33(g_sSamp2) DescriptorSet 0
+                              Decorate 31(g_tTex2) DescriptorSet 0
                               Decorate 33(g_sSamp2) Binding 6
-                              Decorate 43(g_tTex3) DescriptorSet 0
+                              Decorate 33(g_sSamp2) DescriptorSet 0
                               Decorate 43(g_tTex3) Binding 13
-                              Decorate 50(g_sSamp3) DescriptorSet 0
+                              Decorate 43(g_tTex3) DescriptorSet 0
                               Decorate 50(g_sSamp3) Binding 7
-                              Decorate 68(g_tTex4) DescriptorSet 0
+                              Decorate 50(g_sSamp3) DescriptorSet 0
                               Decorate 68(g_tTex4) Binding 15
-                              Decorate 73(g_sSamp4) DescriptorSet 0
+                              Decorate 68(g_tTex4) DescriptorSet 0
                               Decorate 73(g_sSamp4) Binding 8
-                              Decorate 88(g_tTex5) DescriptorSet 0
+                              Decorate 73(g_sSamp4) DescriptorSet 0
                               Decorate 88(g_tTex5) Binding 16
-                              Decorate 90(g_sSamp5) DescriptorSet 0
+                              Decorate 88(g_tTex5) DescriptorSet 0
                               Decorate 90(g_sSamp5) Binding 9
+                              Decorate 90(g_sSamp5) DescriptorSet 0
                               MemberDecorate 97(MyStruct_t) 0 Offset 0
                               MemberDecorate 97(MyStruct_t) 1 Offset 4
                               MemberDecorate 97(MyStruct_t) 2 Offset 16
+                              Decorate 99($Global) Block
                               MemberDecorate 99($Global) 0 Offset 0
                               MemberDecorate 99($Global) 1 Offset 32
                               MemberDecorate 99($Global) 2 Offset 48
                               MemberDecorate 99($Global) 3 Offset 64
-                              Decorate 99($Global) Block
-                              Decorate 101 DescriptorSet 0
                               Decorate 101 Binding 20
-                              Decorate 123(g_tTex_unused1) DescriptorSet 0
+                              Decorate 101 DescriptorSet 0
                               Decorate 123(g_tTex_unused1) Binding 10
-                              Decorate 125(g_sSamp_unused1) DescriptorSet 0
+                              Decorate 123(g_tTex_unused1) DescriptorSet 0
                               Decorate 125(g_sSamp_unused1) Binding 0
-                              Decorate 130(g_tTex_unused2) DescriptorSet 0
+                              Decorate 125(g_sSamp_unused1) DescriptorSet 0
                               Decorate 130(g_tTex_unused2) Binding 12
-                              Decorate 132(g_sSamp_unused2) DescriptorSet 0
+                              Decorate 130(g_tTex_unused2) DescriptorSet 0
                               Decorate 132(g_sSamp_unused2) Binding 0
+                              Decorate 132(g_sSamp_unused2) DescriptorSet 0
                               Decorate 151(@entryPointOutput.Color) Location 0
-                              Decorate 154(g_tTex_unused3) DescriptorSet 0
                               Decorate 154(g_tTex_unused3) Binding 0
+                              Decorate 154(g_tTex_unused3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.register.autoassign.rangetest.frag.out b/Test/baseResults/spv.register.autoassign.rangetest.frag.out
index 84a439a7..b8e25737 100644
--- a/Test/baseResults/spv.register.autoassign.rangetest.frag.out
+++ b/Test/baseResults/spv.register.autoassign.rangetest.frag.out
@@ -22,10 +22,10 @@ INTERNAL ERROR: mapped binding out of range: g_tScene
                               Name 44  "psout"
                               Name 45  "param"
                               Name 49  "psout.Color"
-                              Decorate 21(g_tScene) DescriptorSet 0
                               Decorate 21(g_tScene) Binding 5
-                              Decorate 27(g_tSamp) DescriptorSet 0
+                              Decorate 21(g_tScene) DescriptorSet 0
                               Decorate 27(g_tSamp) Binding 5
+                              Decorate 27(g_tSamp) DescriptorSet 0
                               Decorate 49(psout.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.register.noautoassign.frag.out b/Test/baseResults/spv.register.noautoassign.frag.out
index 8c8cd3cc..8b2c29cb 100644
--- a/Test/baseResults/spv.register.noautoassign.frag.out
+++ b/Test/baseResults/spv.register.noautoassign.frag.out
@@ -44,47 +44,47 @@ spv.register.noautoassign.frag
                               Name 141  "psout"
                               Name 151  "@entryPointOutput.Color"
                               Name 154  "g_tTex_unused3"
-                              Decorate 21(g_tTex1) DescriptorSet 0
                               Decorate 21(g_tTex1) Binding 11
-                              Decorate 25(g_sSamp1) DescriptorSet 0
+                              Decorate 21(g_tTex1) DescriptorSet 0
                               Decorate 25(g_sSamp1) Binding 5
-                              Decorate 31(g_tTex2) DescriptorSet 0
+                              Decorate 25(g_sSamp1) DescriptorSet 0
                               Decorate 31(g_tTex2) Binding 0
-                              Decorate 33(g_sSamp2) DescriptorSet 0
+                              Decorate 31(g_tTex2) DescriptorSet 0
                               Decorate 33(g_sSamp2) Binding 0
-                              Decorate 43(g_tTex3) DescriptorSet 0
+                              Decorate 33(g_sSamp2) DescriptorSet 0
                               Decorate 43(g_tTex3) Binding 13
-                              Decorate 50(g_sSamp3) DescriptorSet 0
+                              Decorate 43(g_tTex3) DescriptorSet 0
                               Decorate 50(g_sSamp3) Binding 7
-                              Decorate 68(g_tTex4) DescriptorSet 0
+                              Decorate 50(g_sSamp3) DescriptorSet 0
                               Decorate 68(g_tTex4) Binding 0
-                              Decorate 73(g_sSamp4) DescriptorSet 0
+                              Decorate 68(g_tTex4) DescriptorSet 0
                               Decorate 73(g_sSamp4) Binding 0
-                              Decorate 88(g_tTex5) DescriptorSet 0
+                              Decorate 73(g_sSamp4) DescriptorSet 0
                               Decorate 88(g_tTex5) Binding 0
-                              Decorate 90(g_sSamp5) DescriptorSet 0
+                              Decorate 88(g_tTex5) DescriptorSet 0
                               Decorate 90(g_sSamp5) Binding 0
+                              Decorate 90(g_sSamp5) DescriptorSet 0
                               MemberDecorate 97(MyStruct_t) 0 Offset 0
                               MemberDecorate 97(MyStruct_t) 1 Offset 4
                               MemberDecorate 97(MyStruct_t) 2 Offset 16
+                              Decorate 99($Global) Block
                               MemberDecorate 99($Global) 0 Offset 0
                               MemberDecorate 99($Global) 1 Offset 32
                               MemberDecorate 99($Global) 2 Offset 48
                               MemberDecorate 99($Global) 3 Offset 64
-                              Decorate 99($Global) Block
-                              Decorate 101 DescriptorSet 0
                               Decorate 101 Binding 0
-                              Decorate 123(g_tTex_unused1) DescriptorSet 0
+                              Decorate 101 DescriptorSet 0
                               Decorate 123(g_tTex_unused1) Binding 10
-                              Decorate 125(g_sSamp_unused1) DescriptorSet 0
+                              Decorate 123(g_tTex_unused1) DescriptorSet 0
                               Decorate 125(g_sSamp_unused1) Binding 0
-                              Decorate 130(g_tTex_unused2) DescriptorSet 0
+                              Decorate 125(g_sSamp_unused1) DescriptorSet 0
                               Decorate 130(g_tTex_unused2) Binding 12
-                              Decorate 132(g_sSamp_unused2) DescriptorSet 0
+                              Decorate 130(g_tTex_unused2) DescriptorSet 0
                               Decorate 132(g_sSamp_unused2) Binding 0
+                              Decorate 132(g_sSamp_unused2) DescriptorSet 0
                               Decorate 151(@entryPointOutput.Color) Location 0
-                              Decorate 154(g_tTex_unused3) DescriptorSet 0
                               Decorate 154(g_tTex_unused3) Binding 0
+                              Decorate 154(g_tTex_unused3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.register.subpass.frag.out b/Test/baseResults/spv.register.subpass.frag.out
index 7c69c918..c20f5962 100644
--- a/Test/baseResults/spv.register.subpass.frag.out
+++ b/Test/baseResults/spv.register.subpass.frag.out
@@ -19,14 +19,14 @@ spv.register.subpass.frag
                               Name 29  "result73"
                               Name 30  "subpass_2"
                               Name 38  "@entryPointOutput"
-                              Decorate 15(subpass_f4) DescriptorSet 0
                               Decorate 15(subpass_f4) Binding 21
+                              Decorate 15(subpass_f4) DescriptorSet 0
                               Decorate 15(subpass_f4) InputAttachmentIndex 1
-                              Decorate 25(subpass_ms_f4) DescriptorSet 0
                               Decorate 25(subpass_ms_f4) Binding 20
+                              Decorate 25(subpass_ms_f4) DescriptorSet 0
                               Decorate 25(subpass_ms_f4) InputAttachmentIndex 4
-                              Decorate 30(subpass_2) DescriptorSet 0
                               Decorate 30(subpass_2) Binding 22
+                              Decorate 30(subpass_2) DescriptorSet 0
                               Decorate 30(subpass_2) InputAttachmentIndex 7
                               Decorate 38(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out
index 0c46493c..3dd60882 100644
--- a/Test/baseResults/spv.rw.autoassign.frag.out
+++ b/Test/baseResults/spv.rw.autoassign.frag.out
@@ -21,10 +21,10 @@ spv.rw.autoassign.frag
                               Name 27  "g_tBuf1du1"
                               Name 33  "psout"
                               Name 42  "@entryPointOutput.Color"
-                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 16(g_tTex1df1) Binding 20
-                              Decorate 27(g_tBuf1du1) DescriptorSet 0
+                              Decorate 16(g_tTex1df1) DescriptorSet 0
                               Decorate 27(g_tBuf1du1) Binding 21
+                              Decorate 27(g_tBuf1du1) DescriptorSet 0
                               Decorate 42(@entryPointOutput.Color) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.sampleId.frag.out b/Test/baseResults/spv.sampleId.frag.out
index 7f3232d1..c4dda4a3 100644
--- a/Test/baseResults/spv.sampleId.frag.out
+++ b/Test/baseResults/spv.sampleId.frag.out
@@ -14,8 +14,8 @@ spv.sampleId.frag
                               Name 8  "gl_SampleID"
                               Name 18  "color"
                               Name 20  "samp"
-                              Decorate 8(gl_SampleID) Flat
                               Decorate 8(gl_SampleID) BuiltIn SampleId
+                              Decorate 8(gl_SampleID) Flat
                               Decorate 18(color) Location 0
                               Decorate 20(samp) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.sampledImageBlock.frag.out b/Test/baseResults/spv.sampledImageBlock.frag.out
index ba46a0fe..a6625f7f 100644
--- a/Test/baseResults/spv.sampledImageBlock.frag.out
+++ b/Test/baseResults/spv.sampledImageBlock.frag.out
@@ -18,14 +18,14 @@ spv.sampledImageBlock.frag
                               Name 23  "paramBuffer"
                               Name 36  "texCoord"
                               Name 45  "fragColor"
-                              Decorate 12(tex0) DescriptorSet 0
                               Decorate 12(tex0) Binding 0
-                              Decorate 16(samp0) DescriptorSet 0
+                              Decorate 12(tex0) DescriptorSet 0
                               Decorate 16(samp0) Binding 1
-                              MemberDecorate 21(ParamBuffer) 0 Offset 0
+                              Decorate 16(samp0) DescriptorSet 0
                               Decorate 21(ParamBuffer) Block
-                              Decorate 23(paramBuffer) DescriptorSet 0
+                              MemberDecorate 21(ParamBuffer) 0 Offset 0
                               Decorate 23(paramBuffer) Binding 2
+                              Decorate 23(paramBuffer) DescriptorSet 0
                               Decorate 36(texCoord) Flat
                               Decorate 36(texCoord) Location 0
                               Decorate 45(fragColor) Location 0
diff --git a/Test/baseResults/spv.samplerlessTextureFunctions.frag.out b/Test/baseResults/spv.samplerlessTextureFunctions.frag.out
index 44799122..ef7b4362 100644
--- a/Test/baseResults/spv.samplerlessTextureFunctions.frag.out
+++ b/Test/baseResults/spv.samplerlessTextureFunctions.frag.out
@@ -25,12 +25,12 @@ spv.samplerlessTextureFunctions.frag
                               Name 42  "bufSize"
                               Name 45  "tex2DLevels"
                               Name 48  "texMSSamples"
-                              Decorate 12(tex2D) DescriptorSet 0
                               Decorate 12(tex2D) Binding 1
-                              Decorate 22(texMS) DescriptorSet 0
+                              Decorate 12(tex2D) DescriptorSet 0
                               Decorate 22(texMS) Binding 1
-                              Decorate 28(buf) DescriptorSet 0
+                              Decorate 22(texMS) DescriptorSet 0
                               Decorate 28(buf) Binding 0
+                              Decorate 28(buf) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.scalarlayout.frag.out b/Test/baseResults/spv.scalarlayout.frag.out
index 977f06b7..a99709d3 100644
--- a/Test/baseResults/spv.scalarlayout.frag.out
+++ b/Test/baseResults/spv.scalarlayout.frag.out
@@ -39,22 +39,22 @@ spv.scalarlayout.frag
                               MemberDecorate 15(S) 4 Offset 28
                               MemberDecorate 15(S) 5 Offset 40
                               Decorate 16 ArrayStride 48
+                              Decorate 17(B1) Block
                               MemberDecorate 17(B1) 0 Offset 0
                               MemberDecorate 17(B1) 1 Offset 4
                               MemberDecorate 17(B1) 2 Offset 12
                               MemberDecorate 17(B1) 3 Offset 24
                               MemberDecorate 17(B1) 4 ColMajor
-                              MemberDecorate 17(B1) 4 Offset 32
                               MemberDecorate 17(B1) 4 MatrixStride 12
+                              MemberDecorate 17(B1) 4 Offset 32
                               MemberDecorate 17(B1) 5 ColMajor
-                              MemberDecorate 17(B1) 5 Offset 56
                               MemberDecorate 17(B1) 5 MatrixStride 12
+                              MemberDecorate 17(B1) 5 Offset 56
                               MemberDecorate 17(B1) 6 Offset 104
                               MemberDecorate 17(B1) 7 Offset 112
                               MemberDecorate 17(B1) 8 Offset 160
-                              Decorate 17(B1) Block
-                              Decorate 19 DescriptorSet 0
                               Decorate 19 Binding 0
+                              Decorate 19 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.scalarlayoutfloat16.frag.out b/Test/baseResults/spv.scalarlayoutfloat16.frag.out
index 93c0d2a1..880786f3 100644
--- a/Test/baseResults/spv.scalarlayoutfloat16.frag.out
+++ b/Test/baseResults/spv.scalarlayoutfloat16.frag.out
@@ -39,6 +39,7 @@ spv.scalarlayoutfloat16.frag
                               MemberDecorate 13(S) 4 Offset 18
                               MemberDecorate 13(S) 5 Offset 24
                               Decorate 14 ArrayStride 32
+                              Decorate 15(B1) Block
                               MemberDecorate 15(B1) 0 Offset 0
                               MemberDecorate 15(B1) 1 Offset 2
                               MemberDecorate 15(B1) 2 Offset 6
@@ -46,9 +47,8 @@ spv.scalarlayoutfloat16.frag
                               MemberDecorate 15(B1) 4 Offset 16
                               MemberDecorate 15(B1) 5 Offset 24
                               MemberDecorate 15(B1) 6 Offset 56
-                              Decorate 15(B1) Block
-                              Decorate 17 DescriptorSet 0
                               Decorate 17 Binding 0
+                              Decorate 17 DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 16
diff --git a/Test/baseResults/spv.separate.frag.out b/Test/baseResults/spv.separate.frag.out
index b960934c..00d3282a 100644
--- a/Test/baseResults/spv.separate.frag.out
+++ b/Test/baseResults/spv.separate.frag.out
@@ -57,84 +57,84 @@ Validation failed
                               Name 293  "tex3D"
                               Name 304  "tex2DRect"
                               Decorate 11(color) Location 0
-                              Decorate 14(t2d) DescriptorSet 0
                               Decorate 14(t2d) Binding 2
-                              Decorate 18(s) DescriptorSet 0
+                              Decorate 14(t2d) DescriptorSet 0
                               Decorate 18(s) Binding 0
-                              Decorate 31(t3d) DescriptorSet 0
+                              Decorate 18(s) DescriptorSet 0
                               Decorate 31(t3d) Binding 3
+                              Decorate 31(t3d) DescriptorSet 0
                               Decorate 34(i) Flat
                               Decorate 34(i) Location 0
-                              Decorate 41(sA) DescriptorSet 0
                               Decorate 41(sA) Binding 1
-                              Decorate 58(tex2D) DescriptorSet 0
+                              Decorate 41(sA) DescriptorSet 0
                               Decorate 58(tex2D) Binding 0
-                              Decorate 64(texCube) DescriptorSet 0
+                              Decorate 58(tex2D) DescriptorSet 0
                               Decorate 64(texCube) Binding 0
-                              Decorate 71(texCubeArray) DescriptorSet 0
+                              Decorate 64(texCube) DescriptorSet 0
                               Decorate 71(texCubeArray) Binding 0
-                              Decorate 77(sShadow) DescriptorSet 0
+                              Decorate 71(texCubeArray) DescriptorSet 0
                               Decorate 77(sShadow) Binding 0
-                              Decorate 84(itexCubeArray) DescriptorSet 0
+                              Decorate 77(sShadow) DescriptorSet 0
                               Decorate 84(itexCubeArray) Binding 0
-                              Decorate 91(utexCubeArray) DescriptorSet 0
+                              Decorate 84(itexCubeArray) DescriptorSet 0
                               Decorate 91(utexCubeArray) Binding 0
-                              Decorate 98(tex1DArray) DescriptorSet 0
+                              Decorate 91(utexCubeArray) DescriptorSet 0
                               Decorate 98(tex1DArray) Binding 0
-                              Decorate 105(itex1DArray) DescriptorSet 0
+                              Decorate 98(tex1DArray) DescriptorSet 0
                               Decorate 105(itex1DArray) Binding 0
-                              Decorate 112(utex1D) DescriptorSet 0
+                              Decorate 105(itex1DArray) DescriptorSet 0
                               Decorate 112(utex1D) Binding 0
-                              Decorate 119(itex1D) DescriptorSet 0
+                              Decorate 112(utex1D) DescriptorSet 0
                               Decorate 119(itex1D) Binding 0
-                              Decorate 126(utex1DArray) DescriptorSet 0
+                              Decorate 119(itex1D) DescriptorSet 0
                               Decorate 126(utex1DArray) Binding 0
-                              Decorate 133(texBuffer) DescriptorSet 0
+                              Decorate 126(utex1DArray) DescriptorSet 0
                               Decorate 133(texBuffer) Binding 0
-                              Decorate 145(tex2DArray) DescriptorSet 0
+                              Decorate 133(texBuffer) DescriptorSet 0
                               Decorate 145(tex2DArray) Binding 0
-                              Decorate 157(itex2D) DescriptorSet 0
+                              Decorate 145(tex2DArray) DescriptorSet 0
                               Decorate 157(itex2D) Binding 0
-                              Decorate 164(itex3D) DescriptorSet 0
+                              Decorate 157(itex2D) DescriptorSet 0
                               Decorate 164(itex3D) Binding 0
-                              Decorate 171(itexCube) DescriptorSet 0
+                              Decorate 164(itex3D) DescriptorSet 0
                               Decorate 171(itexCube) Binding 0
-                              Decorate 178(itex2DArray) DescriptorSet 0
+                              Decorate 171(itexCube) DescriptorSet 0
                               Decorate 178(itex2DArray) Binding 0
-                              Decorate 185(utex2D) DescriptorSet 0
+                              Decorate 178(itex2DArray) DescriptorSet 0
                               Decorate 185(utex2D) Binding 0
-                              Decorate 192(utex3D) DescriptorSet 0
+                              Decorate 185(utex2D) DescriptorSet 0
                               Decorate 192(utex3D) Binding 0
-                              Decorate 199(utexCube) DescriptorSet 0
+                              Decorate 192(utex3D) DescriptorSet 0
                               Decorate 199(utexCube) Binding 0
-                              Decorate 206(utex2DArray) DescriptorSet 0
+                              Decorate 199(utexCube) DescriptorSet 0
                               Decorate 206(utex2DArray) Binding 0
-                              Decorate 213(itex2DRect) DescriptorSet 0
+                              Decorate 206(utex2DArray) DescriptorSet 0
                               Decorate 213(itex2DRect) Binding 0
-                              Decorate 220(utex2DRect) DescriptorSet 0
+                              Decorate 213(itex2DRect) DescriptorSet 0
                               Decorate 220(utex2DRect) Binding 0
-                              Decorate 227(itexBuffer) DescriptorSet 0
+                              Decorate 220(utex2DRect) DescriptorSet 0
                               Decorate 227(itexBuffer) Binding 0
-                              Decorate 234(utexBuffer) DescriptorSet 0
+                              Decorate 227(itexBuffer) DescriptorSet 0
                               Decorate 234(utexBuffer) Binding 0
-                              Decorate 241(tex2DMS) DescriptorSet 0
+                              Decorate 234(utexBuffer) DescriptorSet 0
                               Decorate 241(tex2DMS) Binding 0
-                              Decorate 248(itex2DMS) DescriptorSet 0
+                              Decorate 241(tex2DMS) DescriptorSet 0
                               Decorate 248(itex2DMS) Binding 0
-                              Decorate 255(utex2DMS) DescriptorSet 0
+                              Decorate 248(itex2DMS) DescriptorSet 0
                               Decorate 255(utex2DMS) Binding 0
-                              Decorate 262(tex2DMSArray) DescriptorSet 0
+                              Decorate 255(utex2DMS) DescriptorSet 0
                               Decorate 262(tex2DMSArray) Binding 0
-                              Decorate 269(itex2DMSArray) DescriptorSet 0
+                              Decorate 262(tex2DMSArray) DescriptorSet 0
                               Decorate 269(itex2DMSArray) Binding 0
-                              Decorate 276(utex2DMSArray) DescriptorSet 0
+                              Decorate 269(itex2DMSArray) DescriptorSet 0
                               Decorate 276(utex2DMSArray) Binding 0
-                              Decorate 283(tex1D) DescriptorSet 0
+                              Decorate 276(utex2DMSArray) DescriptorSet 0
                               Decorate 283(tex1D) Binding 0
-                              Decorate 293(tex3D) DescriptorSet 0
+                              Decorate 283(tex1D) DescriptorSet 0
                               Decorate 293(tex3D) Binding 0
-                              Decorate 304(tex2DRect) DescriptorSet 0
+                              Decorate 293(tex3D) DescriptorSet 0
                               Decorate 304(tex2DRect) Binding 0
+                              Decorate 304(tex2DRect) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                8:             TypeFloat 32
diff --git a/Test/baseResults/spv.set.vert.out b/Test/baseResults/spv.set.vert.out
index b311c707..95c7cbdb 100644
--- a/Test/baseResults/spv.set.vert.out
+++ b/Test/baseResults/spv.set.vert.out
@@ -15,12 +15,12 @@ spv.set.vert
                               Name 12  "setBufInst"
                               Name 21  "samp2D"
                               Decorate 9(color) Location 0
-                              MemberDecorate 10(setBuf) 0 Offset 0
                               Decorate 10(setBuf) BufferBlock
-                              Decorate 12(setBufInst) DescriptorSet 0
+                              MemberDecorate 10(setBuf) 0 Offset 0
                               Decorate 12(setBufInst) Binding 8
-                              Decorate 21(samp2D) DescriptorSet 4
+                              Decorate 12(setBufInst) DescriptorSet 0
                               Decorate 21(samp2D) Binding 7
+                              Decorate 21(samp2D) DescriptorSet 4
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.shaderBallot.comp.out b/Test/baseResults/spv.shaderBallot.comp.out
index 143b2e93..da363e9c 100644
--- a/Test/baseResults/spv.shaderBallot.comp.out
+++ b/Test/baseResults/spv.shaderBallot.comp.out
@@ -36,12 +36,12 @@ spv.shaderBallot.comp
                               Decorate 36(gl_SubGroupGtMaskARB) BuiltIn SubgroupGtMaskKHR
                               Decorate 43(gl_SubGroupLeMaskARB) BuiltIn SubgroupLeMaskKHR
                               Decorate 50(gl_SubGroupLtMaskARB) BuiltIn SubgroupLtMaskKHR
+                              Decorate 72(Buffers) BufferBlock
                               MemberDecorate 72(Buffers) 0 Offset 0
                               MemberDecorate 72(Buffers) 1 Offset 16
                               MemberDecorate 72(Buffers) 2 Offset 32
-                              Decorate 72(Buffers) BufferBlock
-                              Decorate 75(data) DescriptorSet 0
                               Decorate 75(data) Binding 0
+                              Decorate 75(data) DescriptorSet 0
                               Decorate 396 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.shaderBallotAMD.comp.out b/Test/baseResults/spv.shaderBallotAMD.comp.out
index 2d8ad553..a52f5b91 100644
--- a/Test/baseResults/spv.shaderBallotAMD.comp.out
+++ b/Test/baseResults/spv.shaderBallotAMD.comp.out
@@ -33,6 +33,7 @@ spv.shaderBallotAMD.comp
                               MemberName 21(Buffers) 7  "i16v"
                               MemberName 21(Buffers) 8  "u16"
                               Name 23  ""
+                              Decorate 21(Buffers) BufferBlock
                               MemberDecorate 21(Buffers) 0 Offset 0
                               MemberDecorate 21(Buffers) 1 Offset 8
                               MemberDecorate 21(Buffers) 2 Offset 16
@@ -42,9 +43,8 @@ spv.shaderBallotAMD.comp
                               MemberDecorate 21(Buffers) 6 Offset 96
                               MemberDecorate 21(Buffers) 7 Offset 104
                               MemberDecorate 21(Buffers) 8 Offset 112
-                              Decorate 21(Buffers) BufferBlock
-                              Decorate 23 DescriptorSet 0
                               Decorate 23 Binding 0
+                              Decorate 23 DescriptorSet 0
                               Decorate 1342 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.shaderDrawParams.vert.out b/Test/baseResults/spv.shaderDrawParams.vert.out
index a84c2fea..58b26cb4 100644
--- a/Test/baseResults/spv.shaderDrawParams.vert.out
+++ b/Test/baseResults/spv.shaderDrawParams.vert.out
@@ -26,17 +26,17 @@ spv.shaderDrawParams.vert
                               Name 37  "gl_DrawIDARB"
                               Decorate 9(gl_BaseVertexARB) BuiltIn BaseVertex
                               Decorate 16(gl_BaseInstanceARB) BuiltIn BaseInstance
+                              Decorate 27(gl_PerVertex) Block
                               MemberDecorate 27(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 27(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 27(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 27(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 27(gl_PerVertex) Block
                               Decorate 31 ArrayStride 16
                               Decorate 33 ArrayStride 64
-                              MemberDecorate 34(Block) 0 Offset 0
                               Decorate 34(Block) Block
-                              Decorate 36(block) DescriptorSet 0
+                              MemberDecorate 34(Block) 0 Offset 0
                               Decorate 36(block) Binding 0
+                              Decorate 36(block) DescriptorSet 0
                               Decorate 37(gl_DrawIDARB) BuiltIn DrawIndex
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.shaderFragMaskAMD.frag.out b/Test/baseResults/spv.shaderFragMaskAMD.frag.out
index 3b461142..17f98d45 100644
--- a/Test/baseResults/spv.shaderFragMaskAMD.frag.out
+++ b/Test/baseResults/spv.shaderFragMaskAMD.frag.out
@@ -21,12 +21,12 @@ spv.shaderFragMaskAMD.frag
                               Name 42  "is2DMSArray"
                               Name 62  "usubpassMS"
                               Name 78  "fragColor"
-                              Decorate 18(s2DMS) DescriptorSet 0
                               Decorate 18(s2DMS) Binding 0
-                              Decorate 42(is2DMSArray) DescriptorSet 0
+                              Decorate 18(s2DMS) DescriptorSet 0
                               Decorate 42(is2DMSArray) Binding 1
-                              Decorate 62(usubpassMS) DescriptorSet 0
+                              Decorate 42(is2DMSArray) DescriptorSet 0
                               Decorate 62(usubpassMS) Binding 2
+                              Decorate 62(usubpassMS) DescriptorSet 0
                               Decorate 62(usubpassMS) InputAttachmentIndex 0
                               Decorate 78(fragColor) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.shaderGroupVote.comp.out b/Test/baseResults/spv.shaderGroupVote.comp.out
index 07241701..0a8c5a24 100644
--- a/Test/baseResults/spv.shaderGroupVote.comp.out
+++ b/Test/baseResults/spv.shaderGroupVote.comp.out
@@ -17,10 +17,10 @@ spv.shaderGroupVote.comp
                               Name 10  "Buffers"
                               MemberName 10(Buffers) 0  "b"
                               Name 12  ""
-                              MemberDecorate 10(Buffers) 0 Offset 0
                               Decorate 10(Buffers) BufferBlock
-                              Decorate 12 DescriptorSet 0
+                              MemberDecorate 10(Buffers) 0 Offset 0
                               Decorate 12 Binding 0
+                              Decorate 12 DescriptorSet 0
                               Decorate 32 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.shaderImageFootprint.frag.out b/Test/baseResults/spv.shaderImageFootprint.frag.out
index 743fd365..0f87bcbb 100644
--- a/Test/baseResults/spv.shaderImageFootprint.frag.out
+++ b/Test/baseResults/spv.shaderImageFootprint.frag.out
@@ -66,17 +66,17 @@ spv.shaderImageFootprint.frag
                               Name 478  "ResType"
                               Name 528  "ResType"
                               Name 577  "ResType"
+                              Decorate 8(result2D) BufferBlock
                               MemberDecorate 8(result2D) 0 Offset 0
                               MemberDecorate 8(result2D) 1 Offset 8
                               MemberDecorate 8(result2D) 2 Offset 16
                               MemberDecorate 8(result2D) 3 Offset 24
                               MemberDecorate 8(result2D) 4 Offset 32
                               MemberDecorate 8(result2D) 5 Offset 36
-                              Decorate 8(result2D) BufferBlock
-                              Decorate 10 DescriptorSet 0
                               Decorate 10 Binding 2
-                              Decorate 17(sample2D) DescriptorSet 0
+                              Decorate 10 DescriptorSet 0
                               Decorate 17(sample2D) Binding 0
+                              Decorate 17(sample2D) DescriptorSet 0
                               Decorate 21(P2) Location 0
                               Decorate 24(granularity) Flat
                               Decorate 24(granularity) Location 3
@@ -85,17 +85,17 @@ spv.shaderImageFootprint.frag
                               Decorate 225(lod) Location 5
                               Decorate 275(dx) Location 6
                               Decorate 277(dy) Location 8
+                              Decorate 377(result3D) BufferBlock
                               MemberDecorate 377(result3D) 0 Offset 0
                               MemberDecorate 377(result3D) 1 Offset 16
                               MemberDecorate 377(result3D) 2 Offset 32
                               MemberDecorate 377(result3D) 3 Offset 48
                               MemberDecorate 377(result3D) 4 Offset 56
                               MemberDecorate 377(result3D) 5 Offset 60
-                              Decorate 377(result3D) BufferBlock
-                              Decorate 379 DescriptorSet 0
                               Decorate 379 Binding 3
-                              Decorate 383(sample3D) DescriptorSet 0
+                              Decorate 379 DescriptorSet 0
                               Decorate 383(sample3D) Binding 1
+                              Decorate 383(sample3D) DescriptorSet 0
                               Decorate 387(P3) Location 2
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.shadingRate.frag.out b/Test/baseResults/spv.shadingRate.frag.out
index 86079ce0..a05cbed1 100644
--- a/Test/baseResults/spv.shadingRate.frag.out
+++ b/Test/baseResults/spv.shadingRate.frag.out
@@ -18,11 +18,11 @@ spv.shadingRate.frag
                               Name 17  "InvocationsPerPixel"
                               Name 19  "gl_InvocationsPerPixelNV"
                               Decorate 9(FragmentSize) Location 0
-                              Decorate 13(gl_FragmentSizeNV) Flat
                               Decorate 13(gl_FragmentSizeNV) BuiltIn FragSizeEXT
+                              Decorate 13(gl_FragmentSizeNV) Flat
                               Decorate 17(InvocationsPerPixel) Location 2
-                              Decorate 19(gl_InvocationsPerPixelNV) Flat
                               Decorate 19(gl_InvocationsPerPixelNV) BuiltIn FragInvocationCountEXT
+                              Decorate 19(gl_InvocationsPerPixelNV) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.smBuiltins.frag.out b/Test/baseResults/spv.smBuiltins.frag.out
index 1619cf63..dc6ce4eb 100644
--- a/Test/baseResults/spv.smBuiltins.frag.out
+++ b/Test/baseResults/spv.smBuiltins.frag.out
@@ -19,14 +19,14 @@ spv.smBuiltins.frag
                               Name 15  "gl_WarpIDNV"
                               Name 17  "gl_SMIDNV"
                               Decorate 9(data) Location 0
-                              Decorate 11(gl_WarpsPerSMNV) Flat
                               Decorate 11(gl_WarpsPerSMNV) BuiltIn WarpsPerSMNV
-                              Decorate 13(gl_SMCountNV) Flat
+                              Decorate 11(gl_WarpsPerSMNV) Flat
                               Decorate 13(gl_SMCountNV) BuiltIn SMCountNV
-                              Decorate 15(gl_WarpIDNV) Flat
+                              Decorate 13(gl_SMCountNV) Flat
                               Decorate 15(gl_WarpIDNV) BuiltIn WarpIDNV
-                              Decorate 17(gl_SMIDNV) Flat
+                              Decorate 15(gl_WarpIDNV) Flat
                               Decorate 17(gl_SMIDNV) BuiltIn SMIDNV
+                              Decorate 17(gl_SMIDNV) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.smBuiltins.vert.out b/Test/baseResults/spv.smBuiltins.vert.out
index c03c3cd9..9d5d664f 100644
--- a/Test/baseResults/spv.smBuiltins.vert.out
+++ b/Test/baseResults/spv.smBuiltins.vert.out
@@ -21,10 +21,10 @@ spv.smBuiltins.vert
                               Name 22  "gl_WarpIDNV"
                               Name 24  "gl_SMIDNV"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 9(Output) BufferBlock
-                              Decorate 11 DescriptorSet 0
+                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 11 Binding 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 15(gl_VertexIndex) BuiltIn VertexIndex
                               Decorate 18(gl_WarpsPerSMNV) BuiltIn WarpsPerSMNV
                               Decorate 20(gl_SMCountNV) BuiltIn SMCountNV
diff --git a/Test/baseResults/spv.sparseTexture.frag.out b/Test/baseResults/spv.sparseTexture.frag.out
index 91dd929d..0d719533 100644
--- a/Test/baseResults/spv.sparseTexture.frag.out
+++ b/Test/baseResults/spv.sparseTexture.frag.out
@@ -46,43 +46,43 @@ Validation failed
                               Name 401  "ic3"
                               Name 410  "i2DMS"
                               Name 419  "outColor"
-                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 29(s2D) Binding 0
+                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 33(c2) Location 0
-                              Decorate 44(s3D) DescriptorSet 0
                               Decorate 44(s3D) Binding 1
+                              Decorate 44(s3D) DescriptorSet 0
                               Decorate 48(c3) Location 1
-                              Decorate 59(isCube) DescriptorSet 0
                               Decorate 59(isCube) Binding 8
-                              Decorate 71(s2DShadow) DescriptorSet 0
+                              Decorate 59(isCube) DescriptorSet 0
                               Decorate 71(s2DShadow) Binding 2
-                              Decorate 86(sCubeArrayShadow) DescriptorSet 0
+                              Decorate 71(s2DShadow) DescriptorSet 0
                               Decorate 86(sCubeArrayShadow) Binding 6
+                              Decorate 86(sCubeArrayShadow) DescriptorSet 0
                               Decorate 89(c4) Location 2
-                              Decorate 108(usCubeArray) DescriptorSet 0
                               Decorate 108(usCubeArray) Binding 10
-                              Decorate 140(us2DRect) DescriptorSet 0
+                              Decorate 108(usCubeArray) DescriptorSet 0
                               Decorate 140(us2DRect) Binding 11
-                              Decorate 154(s2DArrayShadow) DescriptorSet 0
+                              Decorate 140(us2DRect) DescriptorSet 0
                               Decorate 154(s2DArrayShadow) Binding 4
-                              Decorate 188(s2DMS) DescriptorSet 0
+                              Decorate 154(s2DArrayShadow) DescriptorSet 0
                               Decorate 188(s2DMS) Binding 7
-                              Decorate 228(is2DArray) DescriptorSet 0
+                              Decorate 188(s2DMS) DescriptorSet 0
                               Decorate 228(is2DArray) Binding 9
-                              Decorate 259(sCubeShadow) DescriptorSet 0
+                              Decorate 228(is2DArray) DescriptorSet 0
                               Decorate 259(sCubeShadow) Binding 3
-                              Decorate 288(s2DRectShadow) DescriptorSet 0
+                              Decorate 259(sCubeShadow) DescriptorSet 0
                               Decorate 288(s2DRectShadow) Binding 5
-                              Decorate 386(i2D) DescriptorSet 0
+                              Decorate 288(s2DRectShadow) DescriptorSet 0
                               Decorate 386(i2D) Binding 12
+                              Decorate 386(i2D) DescriptorSet 0
                               Decorate 389(ic2) Flat
                               Decorate 389(ic2) Location 3
-                              Decorate 398(ii3D) DescriptorSet 0
                               Decorate 398(ii3D) Binding 13
+                              Decorate 398(ii3D) DescriptorSet 0
                               Decorate 401(ic3) Flat
                               Decorate 401(ic3) Location 4
-                              Decorate 410(i2DMS) DescriptorSet 0
                               Decorate 410(i2DMS) Binding 14
+                              Decorate 410(i2DMS) DescriptorSet 0
                               Decorate 419(outColor) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.sparseTextureClamp.frag.out b/Test/baseResults/spv.sparseTextureClamp.frag.out
index 1c95f60b..5ea7dc4c 100644
--- a/Test/baseResults/spv.sparseTextureClamp.frag.out
+++ b/Test/baseResults/spv.sparseTextureClamp.frag.out
@@ -40,32 +40,32 @@ Validation failed
                               Name 276  "s2DRectShadow"
                               Name 294  "is2DArray"
                               Name 329  "outColor"
-                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 29(s2D) Binding 0
+                              Decorate 29(s2D) DescriptorSet 0
                               Decorate 33(c2) Location 0
                               Decorate 36(lodClamp) Location 3
-                              Decorate 47(s3D) DescriptorSet 0
                               Decorate 47(s3D) Binding 1
+                              Decorate 47(s3D) DescriptorSet 0
                               Decorate 51(c3) Location 1
-                              Decorate 63(isCube) DescriptorSet 0
                               Decorate 63(isCube) Binding 7
-                              Decorate 76(s2DShadow) DescriptorSet 0
+                              Decorate 63(isCube) DescriptorSet 0
                               Decorate 76(s2DShadow) Binding 2
-                              Decorate 92(sCubeArrayShadow) DescriptorSet 0
+                              Decorate 76(s2DShadow) DescriptorSet 0
                               Decorate 92(sCubeArrayShadow) Binding 6
+                              Decorate 92(sCubeArrayShadow) DescriptorSet 0
                               Decorate 95(c4) Location 2
-                              Decorate 154(us2DRect) DescriptorSet 0
                               Decorate 154(us2DRect) Binding 10
-                              Decorate 170(s2DArrayShadow) DescriptorSet 0
+                              Decorate 154(us2DRect) DescriptorSet 0
                               Decorate 170(s2DArrayShadow) Binding 4
-                              Decorate 216(sCubeShadow) DescriptorSet 0
+                              Decorate 170(s2DArrayShadow) DescriptorSet 0
                               Decorate 216(sCubeShadow) Binding 3
-                              Decorate 232(usCubeArray) DescriptorSet 0
+                              Decorate 216(sCubeShadow) DescriptorSet 0
                               Decorate 232(usCubeArray) Binding 9
-                              Decorate 276(s2DRectShadow) DescriptorSet 0
+                              Decorate 232(usCubeArray) DescriptorSet 0
                               Decorate 276(s2DRectShadow) Binding 5
-                              Decorate 294(is2DArray) DescriptorSet 0
+                              Decorate 276(s2DRectShadow) DescriptorSet 0
                               Decorate 294(is2DArray) Binding 8
+                              Decorate 294(is2DArray) DescriptorSet 0
                               Decorate 329(outColor) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.specConst.vert.out b/Test/baseResults/spv.specConst.vert.out
index a2e234bd..404d3085 100644
--- a/Test/baseResults/spv.specConst.vert.out
+++ b/Test/baseResults/spv.specConst.vert.out
@@ -18,11 +18,11 @@ spv.specConst.vert
                               Name 18  "a"
                               Name 25  "gl_VertexID"
                               Name 26  "gl_InstanceID"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
                               Decorate 18(a) SpecId 11
                               Decorate 25(gl_VertexID) BuiltIn VertexId
                               Decorate 26(gl_InstanceID) BuiltIn InstanceId
diff --git a/Test/baseResults/spv.specConstant.comp.out b/Test/baseResults/spv.specConstant.comp.out
index bfe71142..6a7dd1db 100644
--- a/Test/baseResults/spv.specConstant.comp.out
+++ b/Test/baseResults/spv.specConstant.comp.out
@@ -13,10 +13,10 @@ spv.specConstant.comp
                               Name 7  "bn"
                               MemberName 7(bn) 0  "a"
                               Name 9  "bi"
-                              MemberDecorate 7(bn) 0 Offset 0
                               Decorate 7(bn) BufferBlock
-                              Decorate 9(bi) DescriptorSet 0
+                              MemberDecorate 7(bn) 0 Offset 0
                               Decorate 9(bi) Binding 0
+                              Decorate 9(bi) DescriptorSet 0
                               Decorate 12 SpecId 18
                               Decorate 14 SpecId 19
                               Decorate 16 BuiltIn WorkgroupSize
diff --git a/Test/baseResults/spv.specConstant.float16.comp.out b/Test/baseResults/spv.specConstant.float16.comp.out
index 3381fc7e..69153978 100644
--- a/Test/baseResults/spv.specConstant.float16.comp.out
+++ b/Test/baseResults/spv.specConstant.float16.comp.out
@@ -20,13 +20,13 @@ spv.specConstant.float16.comp
                               Name 9  "sb_out"
                               Name 12  "sc0"
                               Name 16  "sc1"
+                              Decorate 7(Output) BufferBlock
                               MemberDecorate 7(Output) 0 NonReadable
                               MemberDecorate 7(Output) 0 Offset 0
                               MemberDecorate 7(Output) 1 NonReadable
                               MemberDecorate 7(Output) 1 Offset 2
-                              Decorate 7(Output) BufferBlock
-                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 9(sb_out) Binding 0
+                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 12(sc0) SpecId 1
                               Decorate 16(sc1) SpecId 2
                2:             TypeVoid
diff --git a/Test/baseResults/spv.specConstant.int16.comp.out b/Test/baseResults/spv.specConstant.int16.comp.out
index 17f385be..9ff1e87e 100644
--- a/Test/baseResults/spv.specConstant.int16.comp.out
+++ b/Test/baseResults/spv.specConstant.int16.comp.out
@@ -20,13 +20,13 @@ spv.specConstant.int16.comp
                               Name 9  "sb_out"
                               Name 12  "sc0"
                               Name 16  "sc1"
+                              Decorate 7(Output) BufferBlock
                               MemberDecorate 7(Output) 0 NonReadable
                               MemberDecorate 7(Output) 0 Offset 0
                               MemberDecorate 7(Output) 1 NonReadable
                               MemberDecorate 7(Output) 1 Offset 2
-                              Decorate 7(Output) BufferBlock
-                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 9(sb_out) Binding 0
+                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 12(sc0) SpecId 1
                               Decorate 16(sc1) SpecId 2
                2:             TypeVoid
diff --git a/Test/baseResults/spv.specConstant.int8.comp.out b/Test/baseResults/spv.specConstant.int8.comp.out
index c906d711..f9ed9db4 100644
--- a/Test/baseResults/spv.specConstant.int8.comp.out
+++ b/Test/baseResults/spv.specConstant.int8.comp.out
@@ -20,13 +20,13 @@ spv.specConstant.int8.comp
                               Name 9  "sb_out"
                               Name 12  "sc0"
                               Name 16  "sc1"
+                              Decorate 7(Output) BufferBlock
                               MemberDecorate 7(Output) 0 NonReadable
                               MemberDecorate 7(Output) 0 Offset 0
                               MemberDecorate 7(Output) 1 NonReadable
                               MemberDecorate 7(Output) 1 Offset 1
-                              Decorate 7(Output) BufferBlock
-                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 9(sb_out) Binding 0
+                              Decorate 9(sb_out) DescriptorSet 0
                               Decorate 12(sc0) SpecId 1
                               Decorate 16(sc1) SpecId 2
                2:             TypeVoid
diff --git a/Test/baseResults/spv.specConstantOp.float16.comp.out b/Test/baseResults/spv.specConstantOp.float16.comp.out
index 97631f14..565e62cb 100644
--- a/Test/baseResults/spv.specConstantOp.float16.comp.out
+++ b/Test/baseResults/spv.specConstantOp.float16.comp.out
@@ -19,12 +19,12 @@ spv.specConstantOp.float16.comp
                               Name 10  ""
                               Name 14  "c"
                               Decorate 7 ArrayStride 2
+                              Decorate 8(S) BufferBlock
                               MemberDecorate 8(S) 0 Restrict
                               MemberDecorate 8(S) 0 NonReadable
                               MemberDecorate 8(S) 0 Offset 0
-                              Decorate 8(S) BufferBlock
-                              Decorate 10 DescriptorSet 0
                               Decorate 10 Binding 0
+                              Decorate 10 DescriptorSet 0
                               Decorate 14(c) SpecId 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.specConstantOp.int16.comp.out b/Test/baseResults/spv.specConstantOp.int16.comp.out
index 13049bed..1d980690 100644
--- a/Test/baseResults/spv.specConstantOp.int16.comp.out
+++ b/Test/baseResults/spv.specConstantOp.int16.comp.out
@@ -19,12 +19,12 @@ spv.specConstantOp.int16.comp
                               Name 10  ""
                               Name 13  "c"
                               Decorate 7 ArrayStride 2
+                              Decorate 8(S) BufferBlock
                               MemberDecorate 8(S) 0 Restrict
                               MemberDecorate 8(S) 0 NonReadable
                               MemberDecorate 8(S) 0 Offset 0
-                              Decorate 8(S) BufferBlock
-                              Decorate 10 DescriptorSet 0
                               Decorate 10 Binding 0
+                              Decorate 10 DescriptorSet 0
                               Decorate 13(c) SpecId 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.specConstantOp.int8.comp.out b/Test/baseResults/spv.specConstantOp.int8.comp.out
index 1cf53014..f621ba93 100644
--- a/Test/baseResults/spv.specConstantOp.int8.comp.out
+++ b/Test/baseResults/spv.specConstantOp.int8.comp.out
@@ -19,12 +19,12 @@ spv.specConstantOp.int8.comp
                               Name 10  ""
                               Name 13  "c"
                               Decorate 7 ArrayStride 1
+                              Decorate 8(S) BufferBlock
                               MemberDecorate 8(S) 0 Restrict
                               MemberDecorate 8(S) 0 NonReadable
                               MemberDecorate 8(S) 0 Offset 0
-                              Decorate 8(S) BufferBlock
-                              Decorate 10 DescriptorSet 0
                               Decorate 10 Binding 0
+                              Decorate 10 DescriptorSet 0
                               Decorate 13(c) SpecId 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.specTexture.frag.out b/Test/baseResults/spv.specTexture.frag.out
index b599e356..a5875d07 100644
--- a/Test/baseResults/spv.specTexture.frag.out
+++ b/Test/baseResults/spv.specTexture.frag.out
@@ -15,8 +15,8 @@ spv.specTexture.frag
                               Name 19  "offs"
                               Decorate 9(color_out) Location 0
                               Decorate 13(tex) Location 0
-                              Decorate 13(tex) DescriptorSet 0
                               Decorate 13(tex) Binding 0
+                              Decorate 13(tex) DescriptorSet 0
                               Decorate 19(offs) SpecId 1
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.ssbo.autoassign.frag.out b/Test/baseResults/spv.ssbo.autoassign.frag.out
index 35381055..fb33e70b 100644
--- a/Test/baseResults/spv.ssbo.autoassign.frag.out
+++ b/Test/baseResults/spv.ssbo.autoassign.frag.out
@@ -33,21 +33,21 @@ spv.ssbo.autoassign.frag
                               MemberDecorate 14(BufType) 0 Offset 0
                               MemberDecorate 14(BufType) 1 Offset 16
                               Decorate 15 ArrayStride 32
+                              Decorate 16(SB0) BufferBlock
                               MemberDecorate 16(SB0) 0 NonWritable
                               MemberDecorate 16(SB0) 0 Offset 0
-                              Decorate 16(SB0) BufferBlock
-                              Decorate 18(SB0) DescriptorSet 0
                               Decorate 18(SB0) Binding 30
+                              Decorate 18(SB0) DescriptorSet 0
+                              Decorate 26(TestCB) Block
                               MemberDecorate 26(TestCB) 0 Offset 0
                               MemberDecorate 26(TestCB) 1 Offset 4
-                              Decorate 26(TestCB) Block
-                              Decorate 28 DescriptorSet 0
                               Decorate 28 Binding 15
+                              Decorate 28 DescriptorSet 0
                               Decorate 56 ArrayStride 32
-                              MemberDecorate 57(SB1) 0 Offset 0
                               Decorate 57(SB1) BufferBlock
-                              Decorate 59(SB1) DescriptorSet 0
+                              MemberDecorate 57(SB1) 0 Offset 0
                               Decorate 59(SB1) Binding 31
+                              Decorate 59(SB1) DescriptorSet 0
                               Decorate 92(pos) Location 0
                               Decorate 95(@entryPointOutput) Location 0
                2:             TypeVoid
diff --git a/Test/baseResults/spv.ssboAlias.frag.out b/Test/baseResults/spv.ssboAlias.frag.out
index 0a5a12b9..73842e8f 100644
--- a/Test/baseResults/spv.ssboAlias.frag.out
+++ b/Test/baseResults/spv.ssboAlias.frag.out
@@ -22,21 +22,21 @@ spv.ssboAlias.frag
                               Name 41  "@entryPointOutput"
                               Name 43  "Buf3"
                               Decorate 12 ArrayStride 4
-                              MemberDecorate 13(Buf1) 0 Offset 0
                               Decorate 13(Buf1) BufferBlock
-                              Decorate 15(Buf1) DescriptorSet 0
+                              MemberDecorate 13(Buf1) 0 Offset 0
                               Decorate 15(Buf1) Binding 84
-                              MemberDecorate 18(Buf1@count) 0 Offset 0
+                              Decorate 15(Buf1) DescriptorSet 0
                               Decorate 18(Buf1@count) BufferBlock
-                              Decorate 20(Buf1@count) DescriptorSet 0
+                              MemberDecorate 18(Buf1@count) 0 Offset 0
                               Decorate 20(Buf1@count) Binding 83
-                              Decorate 28(Buf2) DescriptorSet 0
+                              Decorate 20(Buf1@count) DescriptorSet 0
                               Decorate 28(Buf2) Binding 85
-                              Decorate 29(Buf2@count) DescriptorSet 0
+                              Decorate 28(Buf2) DescriptorSet 0
                               Decorate 29(Buf2@count) Binding 86
+                              Decorate 29(Buf2@count) DescriptorSet 0
                               Decorate 41(@entryPointOutput) Location 0
-                              Decorate 43(Buf3) DescriptorSet 0
                               Decorate 43(Buf3) Binding 84
+                              Decorate 43(Buf3) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.stereoViewRendering.tesc.out b/Test/baseResults/spv.stereoViewRendering.tesc.out
index 100b5534..a0a9cb1b 100644
--- a/Test/baseResults/spv.stereoViewRendering.tesc.out
+++ b/Test/baseResults/spv.stereoViewRendering.tesc.out
@@ -31,16 +31,16 @@ spv.stereoViewRendering.tesc
                               MemberName 27(gl_PerVertex) 4  "gl_SecondaryPositionNV"
                               Name 31  "gl_in"
                               Name 41  "gl_Layer"
+                              Decorate 12(gl_PerVertex) Block
                               MemberDecorate 12(gl_PerVertex) 0 BuiltIn SecondaryPositionNV
                               MemberDecorate 12(gl_PerVertex) 1 BuiltIn SecondaryViewportMaskNV
-                              Decorate 12(gl_PerVertex) Block
                               Decorate 18(gl_InvocationID) BuiltIn InvocationId
+                              Decorate 27(gl_PerVertex) Block
                               MemberDecorate 27(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 27(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 27(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 27(gl_PerVertex) 3 BuiltIn CullDistance
                               MemberDecorate 27(gl_PerVertex) 4 BuiltIn SecondaryPositionNV
-                              Decorate 27(gl_PerVertex) Block
                               Decorate 41(gl_Layer) BuiltIn Layer
                               Decorate 41(gl_Layer) ViewportRelativeNV
                               Decorate 41(gl_Layer) SecondaryViewportRelativeNV 1
diff --git a/Test/baseResults/spv.stereoViewRendering.vert.out b/Test/baseResults/spv.stereoViewRendering.vert.out
index 530d75e1..491c377d 100644
--- a/Test/baseResults/spv.stereoViewRendering.vert.out
+++ b/Test/baseResults/spv.stereoViewRendering.vert.out
@@ -28,11 +28,11 @@ spv.stereoViewRendering.vert
                               Name 26  "gl_Layer"
                               Decorate 11(gl_SecondaryViewportMaskNV) BuiltIn SecondaryViewportMaskNV
                               Decorate 19(gl_SecondaryPositionNV) BuiltIn SecondaryPositionNV
+                              Decorate 21(gl_PerVertex) Block
                               MemberDecorate 21(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 21(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 21(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 21(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 21(gl_PerVertex) Block
                               Decorate 26(gl_Layer) BuiltIn Layer
                               Decorate 26(gl_Layer) ViewportRelativeNV
                               Decorate 26(gl_Layer) SecondaryViewportRelativeNV 2
diff --git a/Test/baseResults/spv.storageBuffer.vert.out b/Test/baseResults/spv.storageBuffer.vert.out
index fdbb4db3..5081998d 100644
--- a/Test/baseResults/spv.storageBuffer.vert.out
+++ b/Test/baseResults/spv.storageBuffer.vert.out
@@ -22,19 +22,19 @@ spv.storageBuffer.vert
                               Name 22  "bb"
                               MemberName 22(bb) 0  "b"
                               Name 24  "bbi"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
-                              MemberDecorate 16(ub) 0 Offset 0
                               Decorate 16(ub) Block
-                              Decorate 18(ubi) DescriptorSet 0
+                              MemberDecorate 16(ub) 0 Offset 0
                               Decorate 18(ubi) Binding 0
-                              MemberDecorate 22(bb) 0 Offset 0
+                              Decorate 18(ubi) DescriptorSet 0
                               Decorate 22(bb) Block
-                              Decorate 24(bbi) DescriptorSet 0
+                              MemberDecorate 22(bb) 0 Offset 0
                               Decorate 24(bbi) Binding 1
+                              Decorate 24(bbi) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.structAssignment.frag.out b/Test/baseResults/spv.structAssignment.frag.out
index a0cfb542..e04b5582 100644
--- a/Test/baseResults/spv.structAssignment.frag.out
+++ b/Test/baseResults/spv.structAssignment.frag.out
@@ -37,8 +37,8 @@ WARNING: 0:6: '' : all default precisions are highp; use precision statements to
                               MemberDecorate 10(lunarStruct3) 1 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
                               Decorate 31(gl_FragColor) Location 0
-                              Decorate 40(samp2D) DescriptorSet 0
                               Decorate 40(samp2D) Binding 0
+                              Decorate 40(samp2D) DescriptorSet 0
                               Decorate 44(coord) RelaxedPrecision
                               Decorate 44(coord) Location 0
                               Decorate 45 RelaxedPrecision
diff --git a/Test/baseResults/spv.structCopy.comp.out b/Test/baseResults/spv.structCopy.comp.out
index 38c7c092..f94e5671 100644
--- a/Test/baseResults/spv.structCopy.comp.out
+++ b/Test/baseResults/spv.structCopy.comp.out
@@ -36,17 +36,17 @@ spv.structCopy.comp
                               MemberDecorate 32(MyStruct) 1 Offset 4
                               MemberDecorate 32(MyStruct) 2 Offset 8
                               Decorate 33 ArrayStride 12
+                              Decorate 34(MyStructs) BufferBlock
                               MemberDecorate 34(MyStructs) 0 Offset 0
                               MemberDecorate 34(MyStructs) 1 Offset 4
-                              Decorate 34(MyStructs) BufferBlock
-                              Decorate 36(my_structs) DescriptorSet 0
                               Decorate 36(my_structs) Binding 0
+                              Decorate 36(my_structs) DescriptorSet 0
+                              Decorate 65(Output) BufferBlock
                               MemberDecorate 65(Output) 0 Offset 0
                               MemberDecorate 65(Output) 1 Offset 4
                               MemberDecorate 65(Output) 2 Offset 8
-                              Decorate 65(Output) BufferBlock
-                              Decorate 67(o) DescriptorSet 0
                               Decorate 67(o) Binding 1
+                              Decorate 67(o) DescriptorSet 0
                               Decorate 80 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.structDeref.frag.out b/Test/baseResults/spv.structDeref.frag.out
index a528a599..b7884308 100644
--- a/Test/baseResults/spv.structDeref.frag.out
+++ b/Test/baseResults/spv.structDeref.frag.out
@@ -42,8 +42,8 @@ spv.structDeref.frag
                               Name 122  "foo2"
                               Decorate 61(coord) Location 0
                               Decorate 99(gl_FragColor) Location 0
-                              Decorate 116(samp2D) DescriptorSet 0
                               Decorate 116(samp2D) Binding 0
+                              Decorate 116(samp2D) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 1
diff --git a/Test/baseResults/spv.structure.frag.out b/Test/baseResults/spv.structure.frag.out
index 6b39c297..3b43ba57 100644
--- a/Test/baseResults/spv.structure.frag.out
+++ b/Test/baseResults/spv.structure.frag.out
@@ -25,8 +25,8 @@ spv.structure.frag
                               Name 54  "coord"
                               Name 59  "foo"
                               Decorate 45(gl_FragColor) Location 0
-                              Decorate 50(samp2D) DescriptorSet 0
                               Decorate 50(samp2D) Binding 0
+                              Decorate 50(samp2D) DescriptorSet 0
                               Decorate 54(coord) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroup.frag.out b/Test/baseResults/spv.subgroup.frag.out
index a882a22e..9c6bfbfc 100644
--- a/Test/baseResults/spv.subgroup.frag.out
+++ b/Test/baseResults/spv.subgroup.frag.out
@@ -17,12 +17,12 @@ spv.subgroup.frag
                               Name 13  "gl_SubgroupInvocationID"
                               Decorate 9(data) Location 0
                               Decorate 11(gl_SubgroupSize) RelaxedPrecision
-                              Decorate 11(gl_SubgroupSize) Flat
                               Decorate 11(gl_SubgroupSize) BuiltIn SubgroupSize
+                              Decorate 11(gl_SubgroupSize) Flat
                               Decorate 12 RelaxedPrecision
                               Decorate 13(gl_SubgroupInvocationID) RelaxedPrecision
-                              Decorate 13(gl_SubgroupInvocationID) Flat
                               Decorate 13(gl_SubgroupInvocationID) BuiltIn SubgroupLocalInvocationId
+                              Decorate 13(gl_SubgroupInvocationID) Flat
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
                2:             TypeVoid
diff --git a/Test/baseResults/spv.subgroup.geom.out b/Test/baseResults/spv.subgroup.geom.out
index 33405950..905e874d 100644
--- a/Test/baseResults/spv.subgroup.geom.out
+++ b/Test/baseResults/spv.subgroup.geom.out
@@ -22,10 +22,10 @@ spv.subgroup.geom
                               Name 18  "gl_SubgroupSize"
                               Name 20  "gl_SubgroupInvocationID"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 9(Output) Block
-                              Decorate 11 DescriptorSet 0
+                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 11 Binding 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 15(gl_PrimitiveIDIn) BuiltIn PrimitiveId
                               Decorate 18(gl_SubgroupSize) RelaxedPrecision
                               Decorate 18(gl_SubgroupSize) BuiltIn SubgroupSize
diff --git a/Test/baseResults/spv.subgroup.tesc.out b/Test/baseResults/spv.subgroup.tesc.out
index aaac4b80..23e0e3e1 100644
--- a/Test/baseResults/spv.subgroup.tesc.out
+++ b/Test/baseResults/spv.subgroup.tesc.out
@@ -19,10 +19,10 @@ spv.subgroup.tesc
                               Name 18  "gl_SubgroupSize"
                               Name 20  "gl_SubgroupInvocationID"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 9(Output) Block
-                              Decorate 11 DescriptorSet 0
+                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 11 Binding 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 15(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 18(gl_SubgroupSize) RelaxedPrecision
                               Decorate 18(gl_SubgroupSize) BuiltIn SubgroupSize
diff --git a/Test/baseResults/spv.subgroup.tese.out b/Test/baseResults/spv.subgroup.tese.out
index f989981c..c0ef120e 100644
--- a/Test/baseResults/spv.subgroup.tese.out
+++ b/Test/baseResults/spv.subgroup.tese.out
@@ -21,10 +21,10 @@ spv.subgroup.tese
                               Name 18  "gl_SubgroupSize"
                               Name 20  "gl_SubgroupInvocationID"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 9(Output) Block
-                              Decorate 11 DescriptorSet 0
+                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 11 Binding 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 15(gl_PrimitiveID) BuiltIn PrimitiveId
                               Decorate 18(gl_SubgroupSize) RelaxedPrecision
                               Decorate 18(gl_SubgroupSize) BuiltIn SubgroupSize
diff --git a/Test/baseResults/spv.subgroup.vert.out b/Test/baseResults/spv.subgroup.vert.out
index 6add1c7c..3537f58f 100644
--- a/Test/baseResults/spv.subgroup.vert.out
+++ b/Test/baseResults/spv.subgroup.vert.out
@@ -18,10 +18,10 @@ spv.subgroup.vert
                               Name 18  "gl_SubgroupSize"
                               Name 20  "gl_SubgroupInvocationID"
                               Decorate 8 ArrayStride 16
-                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 9(Output) Block
-                              Decorate 11 DescriptorSet 0
+                              MemberDecorate 9(Output) 0 Offset 0
                               Decorate 11 Binding 0
+                              Decorate 11 DescriptorSet 0
                               Decorate 15(gl_VertexIndex) BuiltIn VertexIndex
                               Decorate 18(gl_SubgroupSize) RelaxedPrecision
                               Decorate 18(gl_SubgroupSize) BuiltIn SubgroupSize
diff --git a/Test/baseResults/spv.subgroupArithmetic.comp.out b/Test/baseResults/spv.subgroupArithmetic.comp.out
index bd71fc7c..c3b467b0 100644
--- a/Test/baseResults/spv.subgroupArithmetic.comp.out
+++ b/Test/baseResults/spv.subgroupArithmetic.comp.out
@@ -32,13 +32,13 @@ spv.subgroupArithmetic.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 2385 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupBallot.comp.out b/Test/baseResults/spv.subgroupBallot.comp.out
index 51cb7ac1..834331d5 100644
--- a/Test/baseResults/spv.subgroupBallot.comp.out
+++ b/Test/baseResults/spv.subgroupBallot.comp.out
@@ -44,13 +44,13 @@ spv.subgroupBallot.comp
                               Decorate 26(gl_SubgroupGtMask) BuiltIn SubgroupGtMaskKHR
                               Decorate 29(gl_SubgroupLeMask) BuiltIn SubgroupLeMaskKHR
                               Decorate 32(gl_SubgroupLtMask) BuiltIn SubgroupLtMaskKHR
+                              Decorate 46(Buffers) Block
                               MemberDecorate 46(Buffers) 0 Offset 0
                               MemberDecorate 46(Buffers) 1 Offset 16
                               MemberDecorate 46(Buffers) 2 Offset 32
                               MemberDecorate 46(Buffers) 3 Offset 64
-                              Decorate 46(Buffers) Block
-                              Decorate 49(data) DescriptorSet 0
                               Decorate 49(data) Binding 0
+                              Decorate 49(data) DescriptorSet 0
                               Decorate 436 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupBasic.comp.out b/Test/baseResults/spv.subgroupBasic.comp.out
index 51eae759..71350127 100644
--- a/Test/baseResults/spv.subgroupBasic.comp.out
+++ b/Test/baseResults/spv.subgroupBasic.comp.out
@@ -20,10 +20,10 @@ spv.subgroupBasic.comp
                               Name 22  "gl_NumSubgroups"
                               Name 25  "gl_SubgroupID"
                               Decorate 7 ArrayStride 4
-                              MemberDecorate 8(Buffer) 0 Offset 0
                               Decorate 8(Buffer) Block
-                              Decorate 10(data) DescriptorSet 0
+                              MemberDecorate 8(Buffer) 0 Offset 0
                               Decorate 10(data) Binding 0
+                              Decorate 10(data) DescriptorSet 0
                               Decorate 14(gl_SubgroupSize) RelaxedPrecision
                               Decorate 14(gl_SubgroupSize) BuiltIn SubgroupSize
                               Decorate 15 RelaxedPrecision
diff --git a/Test/baseResults/spv.subgroupClustered.comp.out b/Test/baseResults/spv.subgroupClustered.comp.out
index 2529eeff..b86570a2 100644
--- a/Test/baseResults/spv.subgroupClustered.comp.out
+++ b/Test/baseResults/spv.subgroupClustered.comp.out
@@ -32,13 +32,13 @@ spv.subgroupClustered.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 837 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesArithmetic.comp.out b/Test/baseResults/spv.subgroupExtendedTypesArithmetic.comp.out
index 51c2a5e2..92c0029c 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesArithmetic.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesArithmetic.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesArithmetic.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesArithmetic.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 4217 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesBallot.comp.out b/Test/baseResults/spv.subgroupExtendedTypesBallot.comp.out
index 0a706a50..880df85c 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesBallot.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesBallot.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesBallot.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesBallot.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 497 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesClustered.comp.out b/Test/baseResults/spv.subgroupExtendedTypesClustered.comp.out
index f876c5a5..849cd676 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesClustered.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesClustered.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesClustered.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesClustered.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 1457 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesPartitioned.comp.out b/Test/baseResults/spv.subgroupExtendedTypesPartitioned.comp.out
index f2cb8cb1..8381c49d 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesPartitioned.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesPartitioned.comp.out
@@ -51,6 +51,7 @@ spv.subgroupExtendedTypesPartitioned.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 34(Buffers) Block
                               MemberDecorate 34(Buffers) 0 Offset 0
                               MemberDecorate 34(Buffers) 1 Offset 4
                               MemberDecorate 34(Buffers) 2 Offset 8
@@ -58,9 +59,8 @@ spv.subgroupExtendedTypesPartitioned.comp
                               MemberDecorate 34(Buffers) 4 Offset 32
                               MemberDecorate 34(Buffers) 5 Offset 64
                               MemberDecorate 34(Buffers) 6 Offset 96
-                              Decorate 34(Buffers) Block
-                              Decorate 37(data) DescriptorSet 0
                               Decorate 37(data) Binding 0
+                              Decorate 37(data) DescriptorSet 0
                               Decorate 1742 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesQuad.comp.out b/Test/baseResults/spv.subgroupExtendedTypesQuad.comp.out
index 8aa7c120..a0f8564d 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesQuad.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesQuad.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesQuad.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesQuad.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 917 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesRotate.comp.out b/Test/baseResults/spv.subgroupExtendedTypesRotate.comp.out
index 5900db4f..b806ca94 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesRotate.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesRotate.comp.out
@@ -41,11 +41,12 @@ spv.subgroupExtendedTypesRotate.comp
                               MemberName 31(Buffers) 5  "u64"
                               MemberName 31(Buffers) 6  "f16"
                               Name 35  "data"
+                              Decorate 9(roblock) Block
                               MemberDecorate 9(roblock) 0 NonWritable
                               MemberDecorate 9(roblock) 0 Offset 0
-                              Decorate 9(roblock) Block
-                              Decorate 11(ro) DescriptorSet 0
                               Decorate 11(ro) Binding 1
+                              Decorate 11(ro) DescriptorSet 0
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -53,9 +54,8 @@ spv.subgroupExtendedTypesRotate.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 35(data) DescriptorSet 0
                               Decorate 35(data) Binding 0
+                              Decorate 35(data) DescriptorSet 0
                               Decorate 552 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesShuffle.comp.out b/Test/baseResults/spv.subgroupExtendedTypesShuffle.comp.out
index 0051bd7d..354e344c 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesShuffle.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesShuffle.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesShuffle.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesShuffle.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 553 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesShuffleRelative.comp.out b/Test/baseResults/spv.subgroupExtendedTypesShuffleRelative.comp.out
index 46244baa..2ce94812 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesShuffleRelative.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesShuffleRelative.comp.out
@@ -49,6 +49,7 @@ spv.subgroupExtendedTypesShuffleRelative.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 31(Buffers) Block
                               MemberDecorate 31(Buffers) 0 Offset 0
                               MemberDecorate 31(Buffers) 1 Offset 4
                               MemberDecorate 31(Buffers) 2 Offset 8
@@ -56,9 +57,8 @@ spv.subgroupExtendedTypesShuffleRelative.comp
                               MemberDecorate 31(Buffers) 4 Offset 32
                               MemberDecorate 31(Buffers) 5 Offset 64
                               MemberDecorate 31(Buffers) 6 Offset 96
-                              Decorate 31(Buffers) Block
-                              Decorate 34(data) DescriptorSet 0
                               Decorate 34(data) Binding 0
+                              Decorate 34(data) DescriptorSet 0
                               Decorate 553 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupExtendedTypesVote.comp.out b/Test/baseResults/spv.subgroupExtendedTypesVote.comp.out
index a53847ca..f4b35add 100644
--- a/Test/baseResults/spv.subgroupExtendedTypesVote.comp.out
+++ b/Test/baseResults/spv.subgroupExtendedTypesVote.comp.out
@@ -50,6 +50,7 @@ spv.subgroupExtendedTypesVote.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 32(Buffers) Block
                               MemberDecorate 32(Buffers) 0 Offset 0
                               MemberDecorate 32(Buffers) 1 Offset 4
                               MemberDecorate 32(Buffers) 2 Offset 8
@@ -58,9 +59,8 @@ spv.subgroupExtendedTypesVote.comp
                               MemberDecorate 32(Buffers) 5 Offset 64
                               MemberDecorate 32(Buffers) 6 Offset 96
                               MemberDecorate 32(Buffers) 7 Offset 104
-                              Decorate 32(Buffers) Block
-                              Decorate 35(data) DescriptorSet 0
                               Decorate 35(data) Binding 0
+                              Decorate 35(data) DescriptorSet 0
                               Decorate 276 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupPartitioned.comp.out b/Test/baseResults/spv.subgroupPartitioned.comp.out
index 922d393e..4c129dbb 100644
--- a/Test/baseResults/spv.subgroupPartitioned.comp.out
+++ b/Test/baseResults/spv.subgroupPartitioned.comp.out
@@ -34,13 +34,13 @@ spv.subgroupPartitioned.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 28(Buffers) Block
                               MemberDecorate 28(Buffers) 0 Offset 0
                               MemberDecorate 28(Buffers) 1 Offset 16
                               MemberDecorate 28(Buffers) 2 Offset 32
                               MemberDecorate 28(Buffers) 3 Offset 64
-                              Decorate 28(Buffers) Block
-                              Decorate 31(data) DescriptorSet 0
                               Decorate 31(data) Binding 0
+                              Decorate 31(data) DescriptorSet 0
                               Decorate 2806 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupQuad.comp.out b/Test/baseResults/spv.subgroupQuad.comp.out
index b418148c..cc5a1e38 100644
--- a/Test/baseResults/spv.subgroupQuad.comp.out
+++ b/Test/baseResults/spv.subgroupQuad.comp.out
@@ -32,13 +32,13 @@ spv.subgroupQuad.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 695 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupRotate.comp.out b/Test/baseResults/spv.subgroupRotate.comp.out
index 9c87ba63..d988636a 100644
--- a/Test/baseResults/spv.subgroupRotate.comp.out
+++ b/Test/baseResults/spv.subgroupRotate.comp.out
@@ -24,18 +24,18 @@ spv.subgroupRotate.comp
                               MemberName 23(Buffers) 2  "u4"
                               MemberName 23(Buffers) 3  "d4"
                               Name 27  "data"
+                              Decorate 9(roblock) Block
                               MemberDecorate 9(roblock) 0 NonWritable
                               MemberDecorate 9(roblock) 0 Offset 0
-                              Decorate 9(roblock) Block
-                              Decorate 11(ro) DescriptorSet 0
                               Decorate 11(ro) Binding 1
+                              Decorate 11(ro) DescriptorSet 0
+                              Decorate 23(Buffers) Block
                               MemberDecorate 23(Buffers) 0 Offset 0
                               MemberDecorate 23(Buffers) 1 Offset 16
                               MemberDecorate 23(Buffers) 2 Offset 32
                               MemberDecorate 23(Buffers) 3 Offset 64
-                              Decorate 23(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 417 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupShuffle.comp.out b/Test/baseResults/spv.subgroupShuffle.comp.out
index d54e8ae9..d87039b2 100644
--- a/Test/baseResults/spv.subgroupShuffle.comp.out
+++ b/Test/baseResults/spv.subgroupShuffle.comp.out
@@ -32,13 +32,13 @@ spv.subgroupShuffle.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 419 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupShuffleRelative.comp.out b/Test/baseResults/spv.subgroupShuffleRelative.comp.out
index 6bae808f..b0e8a0d4 100644
--- a/Test/baseResults/spv.subgroupShuffleRelative.comp.out
+++ b/Test/baseResults/spv.subgroupShuffleRelative.comp.out
@@ -32,13 +32,13 @@ spv.subgroupShuffleRelative.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 419 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subgroupSizeARB.frag.out b/Test/baseResults/spv.subgroupSizeARB.frag.out
index 5eeb0c09..f1befa4d 100644
--- a/Test/baseResults/spv.subgroupSizeARB.frag.out
+++ b/Test/baseResults/spv.subgroupSizeARB.frag.out
@@ -17,8 +17,8 @@ spv.subgroupSizeARB.frag
                               Name 8  "result"
                               Name 10  "gl_SubGroupSizeARB"
                               Decorate 8(result) Location 0
-                              Decorate 10(gl_SubGroupSizeARB) Flat
                               Decorate 10(gl_SubGroupSizeARB) BuiltIn SubgroupSize
+                              Decorate 10(gl_SubGroupSizeARB) Flat
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.subgroupVote.comp.out b/Test/baseResults/spv.subgroupVote.comp.out
index fa0a01fb..f49dcbe8 100644
--- a/Test/baseResults/spv.subgroupVote.comp.out
+++ b/Test/baseResults/spv.subgroupVote.comp.out
@@ -33,14 +33,14 @@ spv.subgroupVote.comp
                               Decorate 13 RelaxedPrecision
                               Decorate 14 RelaxedPrecision
                               Decorate 16 RelaxedPrecision
+                              Decorate 24(Buffers) Block
                               MemberDecorate 24(Buffers) 0 Offset 0
                               MemberDecorate 24(Buffers) 1 Offset 16
                               MemberDecorate 24(Buffers) 2 Offset 32
                               MemberDecorate 24(Buffers) 3 Offset 64
                               MemberDecorate 24(Buffers) 4 Offset 96
-                              Decorate 24(Buffers) Block
-                              Decorate 27(data) DescriptorSet 0
                               Decorate 27(data) Binding 0
+                              Decorate 27(data) DescriptorSet 0
                               Decorate 215 BuiltIn WorkgroupSize
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.subpass.frag.out b/Test/baseResults/spv.subpass.frag.out
index bf49b08d..27b4d6b5 100644
--- a/Test/baseResults/spv.subpass.frag.out
+++ b/Test/baseResults/spv.subpass.frag.out
@@ -24,24 +24,24 @@ spv.subpass.frag
                               Name 61  "usubMS"
                               Decorate 15(icolor) Location 1
                               Decorate 27(color) Location 0
-                              Decorate 30(sub) DescriptorSet 0
                               Decorate 30(sub) Binding 0
+                              Decorate 30(sub) DescriptorSet 0
                               Decorate 30(sub) InputAttachmentIndex 1
-                              Decorate 35(subMS) DescriptorSet 0
                               Decorate 35(subMS) Binding 1
+                              Decorate 35(subMS) DescriptorSet 0
                               Decorate 35(subMS) InputAttachmentIndex 2
-                              Decorate 42(isub) DescriptorSet 0
                               Decorate 42(isub) Binding 2
+                              Decorate 42(isub) DescriptorSet 0
                               Decorate 42(isub) InputAttachmentIndex 3
-                              Decorate 45(isubMS) DescriptorSet 0
                               Decorate 45(isubMS) Binding 3
+                              Decorate 45(isubMS) DescriptorSet 0
                               Decorate 45(isubMS) InputAttachmentIndex 4
                               Decorate 53(ucolor) Location 2
-                              Decorate 56(usub) DescriptorSet 0
                               Decorate 56(usub) Binding 4
+                              Decorate 56(usub) DescriptorSet 0
                               Decorate 56(usub) InputAttachmentIndex 5
-                              Decorate 61(usubMS) DescriptorSet 0
                               Decorate 61(usubMS) Binding 5
+                              Decorate 61(usubMS) DescriptorSet 0
                               Decorate 61(usubMS) InputAttachmentIndex 6
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.switch.frag.out b/Test/baseResults/spv.switch.frag.out
index 4e7db4df..bacf87ec 100644
--- a/Test/baseResults/spv.switch.frag.out
+++ b/Test/baseResults/spv.switch.frag.out
@@ -37,14 +37,14 @@ WARNING: 0:139: 'switch' : last case/default label not followed by statements
                               Name 246  "param"
                               Name 248  "param"
                               Name 250  "param"
-                              Decorate 15(foo1(vf4;vf4;i1;) RelaxedPrecision
                               Decorate 12(v1) RelaxedPrecision
                               Decorate 13(v2) RelaxedPrecision
                               Decorate 14(i1) RelaxedPrecision
-                              Decorate 20(foo2(vf4;vf4;i1;) RelaxedPrecision
+                              Decorate 15(foo1(vf4;vf4;i1;) RelaxedPrecision
                               Decorate 17(v1) RelaxedPrecision
                               Decorate 18(v2) RelaxedPrecision
                               Decorate 19(i1) RelaxedPrecision
+                              Decorate 20(foo2(vf4;vf4;i1;) RelaxedPrecision
                               Decorate 22 RelaxedPrecision
                               Decorate 27 RelaxedPrecision
                               Decorate 29 RelaxedPrecision
diff --git a/Test/baseResults/spv.test.frag.out b/Test/baseResults/spv.test.frag.out
index c5d63845..e883c032 100644
--- a/Test/baseResults/spv.test.frag.out
+++ b/Test/baseResults/spv.test.frag.out
@@ -21,12 +21,12 @@ spv.test.frag
                               Name 43  "gl_FragColor"
                               Name 46  "u"
                               Name 49  "blend"
-                              Decorate 16(texSampler2D) DescriptorSet 0
                               Decorate 16(texSampler2D) Binding 0
+                              Decorate 16(texSampler2D) DescriptorSet 0
                               Decorate 20(t) Location 3
                               Decorate 22(scale) Location 1
-                              Decorate 33(texSampler3D) DescriptorSet 0
                               Decorate 33(texSampler3D) Binding 1
+                              Decorate 33(texSampler3D) DescriptorSet 0
                               Decorate 37(coords) Location 4
                               Decorate 43(gl_FragColor) Location 0
                               Decorate 46(u) Location 2
diff --git a/Test/baseResults/spv.texture.frag.out b/Test/baseResults/spv.texture.frag.out
index dc1970a9..4c0f5f94 100644
--- a/Test/baseResults/spv.texture.frag.out
+++ b/Test/baseResults/spv.texture.frag.out
@@ -39,19 +39,19 @@ WARNING: 0:12: varying deprecated in version 130; may be removed in future relea
                               Name 297  "blend"
                               Name 303  "scale"
                               Name 304  "t"
-                              Decorate 32(texSampler1D) DescriptorSet 0
                               Decorate 32(texSampler1D) Binding 0
+                              Decorate 32(texSampler1D) DescriptorSet 0
                               Decorate 47(coords2D) Location 4
-                              Decorate 76(texSampler2D) DescriptorSet 0
                               Decorate 76(texSampler2D) Binding 1
-                              Decorate 104(texSampler3D) DescriptorSet 0
+                              Decorate 76(texSampler2D) DescriptorSet 0
                               Decorate 104(texSampler3D) Binding 2
-                              Decorate 130(texSamplerCube) DescriptorSet 0
+                              Decorate 104(texSampler3D) DescriptorSet 0
                               Decorate 130(texSamplerCube) Binding 3
-                              Decorate 145(shadowSampler1D) DescriptorSet 0
+                              Decorate 130(texSamplerCube) DescriptorSet 0
                               Decorate 145(shadowSampler1D) Binding 4
-                              Decorate 164(shadowSampler2D) DescriptorSet 0
+                              Decorate 145(shadowSampler1D) DescriptorSet 0
                               Decorate 164(shadowSampler2D) Binding 5
+                              Decorate 164(shadowSampler2D) DescriptorSet 0
                               Decorate 291(gl_FragColor) Location 0
                               Decorate 294(u) Location 2
                               Decorate 297(blend) Location 0
diff --git a/Test/baseResults/spv.texture.sampler.transform.frag.out b/Test/baseResults/spv.texture.sampler.transform.frag.out
index 4e9534e7..b2fe8230 100644
--- a/Test/baseResults/spv.texture.sampler.transform.frag.out
+++ b/Test/baseResults/spv.texture.sampler.transform.frag.out
@@ -14,8 +14,8 @@ spv.texture.sampler.transform.frag
                               Name 13  "tex"
                               Name 17  "coord"
                               Decorate 9(color) Location 0
-                              Decorate 13(tex) DescriptorSet 0
                               Decorate 13(tex) Binding 0
+                              Decorate 13(tex) DescriptorSet 0
                               Decorate 17(coord) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out
index 35053f38..701cacda 100644
--- a/Test/baseResults/spv.texture.vert.out
+++ b/Test/baseResults/spv.texture.vert.out
@@ -23,19 +23,19 @@ spv.texture.vert
                               Name 106  "shadowSampler1D"
                               Name 118  "shadowSampler2D"
                               Name 148  "gl_Position"
-                              Decorate 29(texSampler1D) DescriptorSet 0
                               Decorate 29(texSampler1D) Binding 0
+                              Decorate 29(texSampler1D) DescriptorSet 0
                               Decorate 39(coords2D) Location 0
-                              Decorate 56(texSampler2D) DescriptorSet 0
                               Decorate 56(texSampler2D) Binding 1
-                              Decorate 80(texSampler3D) DescriptorSet 0
+                              Decorate 56(texSampler2D) DescriptorSet 0
                               Decorate 80(texSampler3D) Binding 2
-                              Decorate 96(texSamplerCube) DescriptorSet 0
+                              Decorate 80(texSampler3D) DescriptorSet 0
                               Decorate 96(texSamplerCube) Binding 3
-                              Decorate 106(shadowSampler1D) DescriptorSet 0
+                              Decorate 96(texSamplerCube) DescriptorSet 0
                               Decorate 106(shadowSampler1D) Binding 4
-                              Decorate 118(shadowSampler2D) DescriptorSet 0
+                              Decorate 106(shadowSampler1D) DescriptorSet 0
                               Decorate 118(shadowSampler2D) Binding 5
+                              Decorate 118(shadowSampler2D) DescriptorSet 0
                               Decorate 148(gl_Position) BuiltIn Position
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.textureBuffer.vert.out b/Test/baseResults/spv.textureBuffer.vert.out
index f5b271f6..6cd40d2a 100644
--- a/Test/baseResults/spv.textureBuffer.vert.out
+++ b/Test/baseResults/spv.textureBuffer.vert.out
@@ -15,16 +15,16 @@ spv.textureBuffer.vert
                               Name 23  "sBuf"
                               Name 32  "utBuf"
                               Name 38  "itBuf"
-                              Decorate 9(tBuf) DescriptorSet 0
                               Decorate 9(tBuf) Binding 0
-                              Decorate 13(s) DescriptorSet 0
+                              Decorate 9(tBuf) DescriptorSet 0
                               Decorate 13(s) Binding 1
-                              Decorate 23(sBuf) DescriptorSet 0
+                              Decorate 13(s) DescriptorSet 0
                               Decorate 23(sBuf) Binding 2
-                              Decorate 32(utBuf) DescriptorSet 0
+                              Decorate 23(sBuf) DescriptorSet 0
                               Decorate 32(utBuf) Binding 3
-                              Decorate 38(itBuf) DescriptorSet 0
+                              Decorate 32(utBuf) DescriptorSet 0
                               Decorate 38(itBuf) Binding 4
+                              Decorate 38(itBuf) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.textureGatherBiasLod.frag.out b/Test/baseResults/spv.textureGatherBiasLod.frag.out
index f47e16a7..9fd195f5 100644
--- a/Test/baseResults/spv.textureGatherBiasLod.frag.out
+++ b/Test/baseResults/spv.textureGatherBiasLod.frag.out
@@ -30,17 +30,17 @@ spv.textureGatherBiasLod.frag
                               Name 104  "ResType"
                               Name 176  "lod"
                               Name 296  "fragColor"
-                              Decorate 16(s2D) DescriptorSet 0
                               Decorate 16(s2D) Binding 0
+                              Decorate 16(s2D) DescriptorSet 0
                               Decorate 20(c2) Location 0
                               Decorate 25(bias) Location 4
-                              Decorate 33(s2DArray) DescriptorSet 0
                               Decorate 33(s2DArray) Binding 1
+                              Decorate 33(s2DArray) DescriptorSet 0
                               Decorate 37(c3) Location 1
-                              Decorate 47(sCube) DescriptorSet 0
                               Decorate 47(sCube) Binding 2
-                              Decorate 58(sCubeArray) DescriptorSet 0
+                              Decorate 47(sCube) DescriptorSet 0
                               Decorate 58(sCubeArray) Binding 3
+                              Decorate 58(sCubeArray) DescriptorSet 0
                               Decorate 61(c4) Location 2
                               Decorate 176(lod) Location 3
                               Decorate 296(fragColor) Location 0
diff --git a/Test/baseResults/spv.tpipBlockMatchGatherSAD.frag.out b/Test/baseResults/spv.tpipBlockMatchGatherSAD.frag.out
index 6a543b3c..63e4e15c 100644
--- a/Test/baseResults/spv.tpipBlockMatchGatherSAD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchGatherSAD.frag.out
@@ -29,22 +29,22 @@ spv.tpipBlockMatchGatherSAD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBlockMatchGatherSSD.frag.out b/Test/baseResults/spv.tpipBlockMatchGatherSSD.frag.out
index 74479c1b..f5aa4cb8 100644
--- a/Test/baseResults/spv.tpipBlockMatchGatherSSD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchGatherSSD.frag.out
@@ -29,22 +29,22 @@ spv.tpipBlockMatchGatherSSD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBlockMatchSAD.frag.out b/Test/baseResults/spv.tpipBlockMatchSAD.frag.out
index a807d923..eb5f4744 100644
--- a/Test/baseResults/spv.tpipBlockMatchSAD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchSAD.frag.out
@@ -26,22 +26,22 @@ spv.tpipBlockMatchSAD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBlockMatchSSD.frag.out b/Test/baseResults/spv.tpipBlockMatchSSD.frag.out
index e7ac73b6..d758c0b1 100644
--- a/Test/baseResults/spv.tpipBlockMatchSSD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchSSD.frag.out
@@ -26,22 +26,22 @@ spv.tpipBlockMatchSSD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBlockMatchWindowSAD.frag.out b/Test/baseResults/spv.tpipBlockMatchWindowSAD.frag.out
index cd20d771..a27c016f 100644
--- a/Test/baseResults/spv.tpipBlockMatchWindowSAD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchWindowSAD.frag.out
@@ -29,25 +29,25 @@ spv.tpipBlockMatchWindowSAD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
                               Decorate 48(samp) DecorationBlockMatchSamplerQCOM
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
                               Decorate 61(target_samp) DecorationBlockMatchSamplerQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
                               Decorate 64(ref_samp) DecorationBlockMatchSamplerQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBlockMatchWindowSSD.frag.out b/Test/baseResults/spv.tpipBlockMatchWindowSSD.frag.out
index 797ecd74..e22097ff 100644
--- a/Test/baseResults/spv.tpipBlockMatchWindowSSD.frag.out
+++ b/Test/baseResults/spv.tpipBlockMatchWindowSSD.frag.out
@@ -29,25 +29,25 @@ spv.tpipBlockMatchWindowSSD.frag
                               Name 71  "tex2DArray_weights"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 41(fragColor) Location 0
-                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) Binding 1
-                              Decorate 48(samp) DescriptorSet 0
-                              Decorate 48(samp) Binding 3
-                              Decorate 53(tex2D_src2) DescriptorSet 0
-                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 44(tex2D_src1) DescriptorSet 0
                               Decorate 44(tex2D_src1) DecorationBlockMatchTextureQCOM
+                              Decorate 48(samp) Binding 3
+                              Decorate 48(samp) DescriptorSet 0
                               Decorate 48(samp) DecorationBlockMatchSamplerQCOM
+                              Decorate 53(tex2D_src2) Binding 2
+                              Decorate 53(tex2D_src2) DescriptorSet 0
                               Decorate 53(tex2D_src2) DecorationBlockMatchTextureQCOM
-                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) Binding 4
-                              Decorate 64(ref_samp) DescriptorSet 0
-                              Decorate 64(ref_samp) Binding 5
+                              Decorate 61(target_samp) DescriptorSet 0
                               Decorate 61(target_samp) DecorationBlockMatchTextureQCOM
                               Decorate 61(target_samp) DecorationBlockMatchSamplerQCOM
+                              Decorate 64(ref_samp) Binding 5
+                              Decorate 64(ref_samp) DescriptorSet 0
                               Decorate 64(ref_samp) DecorationBlockMatchTextureQCOM
                               Decorate 64(ref_samp) DecorationBlockMatchSamplerQCOM
-                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                               Decorate 71(tex2DArray_weights) Binding 0
+                              Decorate 71(tex2DArray_weights) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.tpipBoxFilter.frag.out b/Test/baseResults/spv.tpipBoxFilter.frag.out
index 5620a816..46d802c4 100644
--- a/Test/baseResults/spv.tpipBoxFilter.frag.out
+++ b/Test/baseResults/spv.tpipBoxFilter.frag.out
@@ -22,17 +22,17 @@ spv.tpipBoxFilter.frag
                               Name 41  "tex2DArray_weights"
                               Name 42  "tex2D_src2"
                               Decorate 15(fragColor) Location 0
-                              Decorate 18(tex2D_src1) DescriptorSet 0
                               Decorate 18(tex2D_src1) Binding 1
-                              Decorate 22(samp) DescriptorSet 0
+                              Decorate 18(tex2D_src1) DescriptorSet 0
                               Decorate 22(samp) Binding 3
+                              Decorate 22(samp) DescriptorSet 0
                               Decorate 27(v_texcoord) Location 0
-                              Decorate 33(tex_samp) DescriptorSet 0
                               Decorate 33(tex_samp) Binding 4
-                              Decorate 41(tex2DArray_weights) DescriptorSet 0
+                              Decorate 33(tex_samp) DescriptorSet 0
                               Decorate 41(tex2DArray_weights) Binding 0
-                              Decorate 42(tex2D_src2) DescriptorSet 0
+                              Decorate 41(tex2DArray_weights) DescriptorSet 0
                               Decorate 42(tex2D_src2) Binding 2
+                              Decorate 42(tex2D_src2) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.tpipSampleWeighted.frag.out b/Test/baseResults/spv.tpipSampleWeighted.frag.out
index bf108742..652143c7 100644
--- a/Test/baseResults/spv.tpipSampleWeighted.frag.out
+++ b/Test/baseResults/spv.tpipSampleWeighted.frag.out
@@ -22,21 +22,21 @@ spv.tpipSampleWeighted.frag
                               Name 39  "tex_samp_array"
                               Name 42  "tex2D_src2"
                               Decorate 9(fragColor) Location 0
-                              Decorate 12(tex2D_src1) DescriptorSet 0
                               Decorate 12(tex2D_src1) Binding 1
-                              Decorate 16(samp) DescriptorSet 0
+                              Decorate 12(tex2D_src1) DescriptorSet 0
                               Decorate 16(samp) Binding 3
+                              Decorate 16(samp) DescriptorSet 0
                               Decorate 21(v_texcoord) Location 0
-                              Decorate 27(tex2DArray_weights) DescriptorSet 0
                               Decorate 27(tex2DArray_weights) Binding 0
+                              Decorate 27(tex2DArray_weights) DescriptorSet 0
                               Decorate 27(tex2DArray_weights) DecorationWeightTextureQCOM
-                              Decorate 34(tex_samp) DescriptorSet 0
                               Decorate 34(tex_samp) Binding 4
-                              Decorate 39(tex_samp_array) DescriptorSet 0
+                              Decorate 34(tex_samp) DescriptorSet 0
                               Decorate 39(tex_samp_array) Binding 5
+                              Decorate 39(tex_samp_array) DescriptorSet 0
                               Decorate 39(tex_samp_array) DecorationWeightTextureQCOM
-                              Decorate 42(tex2D_src2) DescriptorSet 0
                               Decorate 42(tex2D_src2) Binding 2
+                              Decorate 42(tex2D_src2) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.tpipTextureArrays.frag.out b/Test/baseResults/spv.tpipTextureArrays.frag.out
index 28b63f57..cb5a62ad 100644
--- a/Test/baseResults/spv.tpipTextureArrays.frag.out
+++ b/Test/baseResults/spv.tpipTextureArrays.frag.out
@@ -24,14 +24,14 @@ spv.tpipTextureArrays.frag
                               Name 67  "samp"
                               Decorate 13(v_texcoord) Location 0
                               Decorate 46(fragColor) Location 0
-                              Decorate 51(samplers) DescriptorSet 0
                               Decorate 51(samplers) Binding 5
-                              Decorate 60(tex2D_srcs) DescriptorSet 0
-                              Decorate 60(tex2D_srcs) Binding 4
-                              Decorate 67(samp) DescriptorSet 0
-                              Decorate 67(samp) Binding 3
+                              Decorate 51(samplers) DescriptorSet 0
                               Decorate 55 DecorationBlockMatchTextureQCOM
+                              Decorate 60(tex2D_srcs) Binding 4
+                              Decorate 60(tex2D_srcs) DescriptorSet 0
                               Decorate 63 DecorationBlockMatchTextureQCOM
+                              Decorate 67(samp) Binding 3
+                              Decorate 67(samp) DescriptorSet 0
                               Decorate 74 DecorationBlockMatchTextureQCOM
                               Decorate 79 DecorationBlockMatchTextureQCOM
                2:             TypeVoid
diff --git a/Test/baseResults/spv.uint.frag.out b/Test/baseResults/spv.uint.frag.out
index a78acae4..8a8f9980 100644
--- a/Test/baseResults/spv.uint.frag.out
+++ b/Test/baseResults/spv.uint.frag.out
@@ -59,8 +59,8 @@ spv.uint.frag
                               Decorate 68(c) RelaxedPrecision
                               Decorate 68(c) Location 0
                               Decorate 72(usampler) RelaxedPrecision
-                              Decorate 72(usampler) DescriptorSet 0
                               Decorate 72(usampler) Binding 0
+                              Decorate 72(usampler) DescriptorSet 0
                               Decorate 73 RelaxedPrecision
                               Decorate 77(tc) RelaxedPrecision
                               Decorate 77(tc) Location 2
diff --git a/Test/baseResults/spv.uniformArray.frag.out b/Test/baseResults/spv.uniformArray.frag.out
index 09cd3532..26e066a6 100644
--- a/Test/baseResults/spv.uniformArray.frag.out
+++ b/Test/baseResults/spv.uniformArray.frag.out
@@ -20,8 +20,8 @@ spv.uniformArray.frag
                               Decorate 25(inColor) Location 0
                               Decorate 43(alpha) Location 7
                               Decorate 54(gl_FragColor) Location 0
-                              Decorate 59(texSampler2D) DescriptorSet 0
                               Decorate 59(texSampler2D) Binding 0
+                              Decorate 59(texSampler2D) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.uniformInitializer.frag.out b/Test/baseResults/spv.uniformInitializer.frag.out
index abebf625..da32af55 100644
--- a/Test/baseResults/spv.uniformInitializer.frag.out
+++ b/Test/baseResults/spv.uniformInitializer.frag.out
@@ -14,8 +14,8 @@ spv.uniformInitializer.frag
                               Name 14  "in_color"
                               Decorate 9(color) Location 0
                               Decorate 14(in_color) Location 0
-                              Decorate 14(in_color) DescriptorSet 0
                               Decorate 14(in_color) Binding 0
+                              Decorate 14(in_color) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.uniformInitializerStruct.frag.out b/Test/baseResults/spv.uniformInitializerStruct.frag.out
index 058bc34f..7b0f7334 100644
--- a/Test/baseResults/spv.uniformInitializerStruct.frag.out
+++ b/Test/baseResults/spv.uniformInitializerStruct.frag.out
@@ -19,8 +19,8 @@ spv.uniformInitializerStruct.frag
                               Name 34  "parts"
                               Decorate 9(color) Location 0
                               Decorate 34(parts) Location 0
-                              Decorate 34(parts) DescriptorSet 0
                               Decorate 34(parts) Binding 0
+                              Decorate 34(parts) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out
index f78119c2..ee2c1c6b 100644
--- a/Test/baseResults/spv.variableArrayIndex.frag.out
+++ b/Test/baseResults/spv.variableArrayIndex.frag.out
@@ -41,8 +41,8 @@ spv.variableArrayIndex.frag
                               Decorate 36(foo) Flat
                               Decorate 36(foo) Location 1
                               Decorate 54(gl_FragColor) Location 0
-                              Decorate 59(samp2D) DescriptorSet 0
                               Decorate 59(samp2D) Binding 0
+                              Decorate 59(samp2D) DescriptorSet 0
                               Decorate 63(coord) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/spv.varyingArray.frag.out b/Test/baseResults/spv.varyingArray.frag.out
index 9d001bc0..d97b7f72 100644
--- a/Test/baseResults/spv.varyingArray.frag.out
+++ b/Test/baseResults/spv.varyingArray.frag.out
@@ -17,8 +17,8 @@ spv.varyingArray.frag
                               Name 39  "alpha"
                               Name 45  "gl_FragColor"
                               Name 48  "foo"
-                              Decorate 13(texSampler2D) DescriptorSet 0
                               Decorate 13(texSampler2D) Binding 0
+                              Decorate 13(texSampler2D) DescriptorSet 0
                               Decorate 19(TexCoord) Location 2
                               Decorate 34(color) Location 0
                               Decorate 39(alpha) Location 1
diff --git a/Test/baseResults/spv.varyingArrayIndirect.frag.out b/Test/baseResults/spv.varyingArrayIndirect.frag.out
index 00135f6e..7a44c8f9 100644
--- a/Test/baseResults/spv.varyingArrayIndirect.frag.out
+++ b/Test/baseResults/spv.varyingArrayIndirect.frag.out
@@ -19,8 +19,8 @@ spv.varyingArrayIndirect.frag
                               Name 45  "color"
                               Name 50  "alpha"
                               Name 56  "gl_FragColor"
-                              Decorate 13(texSampler2D) DescriptorSet 0
                               Decorate 13(texSampler2D) Binding 0
+                              Decorate 13(texSampler2D) DescriptorSet 0
                               Decorate 19(userIn) Location 8
                               Decorate 22(b) Flat
                               Decorate 22(b) Location 11
diff --git a/Test/baseResults/spv.viewportArray2.tesc.out b/Test/baseResults/spv.viewportArray2.tesc.out
index f719a97e..16e1686a 100644
--- a/Test/baseResults/spv.viewportArray2.tesc.out
+++ b/Test/baseResults/spv.viewportArray2.tesc.out
@@ -20,8 +20,8 @@ spv.viewportArray2.tesc
                               Name 14  "gl_out"
                               Name 16  "gl_InvocationID"
                               Name 22  "gl_Layer"
-                              MemberDecorate 10(gl_PerVertex) 0 BuiltIn ViewportMaskNV
                               Decorate 10(gl_PerVertex) Block
+                              MemberDecorate 10(gl_PerVertex) 0 BuiltIn ViewportMaskNV
                               Decorate 16(gl_InvocationID) BuiltIn InvocationId
                               Decorate 22(gl_Layer) BuiltIn Layer
                               Decorate 22(gl_Layer) ViewportRelativeNV
diff --git a/Test/baseResults/spv.volatileAtomic.comp.out b/Test/baseResults/spv.volatileAtomic.comp.out
index 53673d35..13aec2f3 100644
--- a/Test/baseResults/spv.volatileAtomic.comp.out
+++ b/Test/baseResults/spv.volatileAtomic.comp.out
@@ -14,12 +14,12 @@ spv.volatileAtomic.comp
                               MemberName 8(D) 0  "d"
                               Name 10  "d"
                               Decorate 7 ArrayStride 4
+                              Decorate 8(D) BufferBlock
                               MemberDecorate 8(D) 0 Volatile
                               MemberDecorate 8(D) 0 Coherent
                               MemberDecorate 8(D) 0 Offset 0
-                              Decorate 8(D) BufferBlock
-                              Decorate 10(d) DescriptorSet 0
                               Decorate 10(d) Binding 3
+                              Decorate 10(d) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/spv.vulkan110.int16.frag.out b/Test/baseResults/spv.vulkan110.int16.frag.out
index d5c83d52..4e435dfd 100644
--- a/Test/baseResults/spv.vulkan110.int16.frag.out
+++ b/Test/baseResults/spv.vulkan110.int16.frag.out
@@ -77,10 +77,11 @@ spv.vulkan110.int16.frag
                               Name 532  "block"
                               Name 533  "si16"
                               Name 534  "su16"
-                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 24(Uniforms) Block
-                              Decorate 26 DescriptorSet 0
+                              MemberDecorate 24(Uniforms) 0 Offset 0
                               Decorate 26 Binding 0
+                              Decorate 26 DescriptorSet 0
+                              Decorate 530(Block) Block
                               MemberDecorate 530(Block) 0 Offset 0
                               MemberDecorate 530(Block) 1 Offset 4
                               MemberDecorate 530(Block) 2 Offset 8
@@ -89,9 +90,8 @@ spv.vulkan110.int16.frag
                               MemberDecorate 530(Block) 5 Offset 28
                               MemberDecorate 530(Block) 6 Offset 32
                               MemberDecorate 530(Block) 7 Offset 40
-                              Decorate 530(Block) Block
-                              Decorate 532(block) DescriptorSet 0
                               Decorate 532(block) Binding 1
+                              Decorate 532(block) DescriptorSet 0
                               Decorate 533(si16) SpecId 100
                               Decorate 534(su16) SpecId 101
                2:             TypeVoid
diff --git a/Test/baseResults/spv.vulkan110.storageBuffer.vert.out b/Test/baseResults/spv.vulkan110.storageBuffer.vert.out
index ab88c581..c9231ea0 100644
--- a/Test/baseResults/spv.vulkan110.storageBuffer.vert.out
+++ b/Test/baseResults/spv.vulkan110.storageBuffer.vert.out
@@ -21,19 +21,19 @@ spv.vulkan110.storageBuffer.vert
                               Name 22  "bb"
                               MemberName 22(bb) 0  "b"
                               Name 24  "bbi"
+                              Decorate 11(gl_PerVertex) Block
                               MemberDecorate 11(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 11(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 11(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 11(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 11(gl_PerVertex) Block
-                              MemberDecorate 16(ub) 0 Offset 0
                               Decorate 16(ub) Block
-                              Decorate 18(ubi) DescriptorSet 0
+                              MemberDecorate 16(ub) 0 Offset 0
                               Decorate 18(ubi) Binding 0
-                              MemberDecorate 22(bb) 0 Offset 0
+                              Decorate 18(ubi) DescriptorSet 0
                               Decorate 22(bb) Block
-                              Decorate 24(bbi) DescriptorSet 0
+                              MemberDecorate 22(bb) 0 Offset 0
                               Decorate 24(bbi) Binding 1
+                              Decorate 24(bbi) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.xfb.vert.out b/Test/baseResults/spv.xfb.vert.out
index 4283e200..e76e6b35 100644
--- a/Test/baseResults/spv.xfb.vert.out
+++ b/Test/baseResults/spv.xfb.vert.out
@@ -20,23 +20,23 @@ spv.xfb.vert
                               Name 14  ""
                               Name 15  "out4"
                               Decorate 8(out1) Location 0
+                              Decorate 8(out1) Offset 12
                               Decorate 8(out1) XfbBuffer 3
                               Decorate 8(out1) XfbStride 48
-                              Decorate 8(out1) Offset 12
-                              MemberDecorate 9(outXfb) 0 Offset 8
                               Decorate 9(outXfb) Block
+                              MemberDecorate 9(outXfb) 0 Offset 8
                               Decorate 11 Location 1
                               Decorate 11 XfbBuffer 2
                               Decorate 11 XfbStride 32
-                              MemberDecorate 12(outXfb2) 0 Offset 60
                               Decorate 12(outXfb2) Block
+                              MemberDecorate 12(outXfb2) 0 Offset 60
                               Decorate 14 Location 3
                               Decorate 14 XfbBuffer 1
                               Decorate 14 XfbStride 64
                               Decorate 15(out4) Location 4
+                              Decorate 15(out4) Offset 4
                               Decorate 15(out4) XfbBuffer 0
                               Decorate 15(out4) XfbStride 8
-                              Decorate 15(out4) Offset 4
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.xfb2.vert.out b/Test/baseResults/spv.xfb2.vert.out
index b4b09bd0..a681fd3e 100644
--- a/Test/baseResults/spv.xfb2.vert.out
+++ b/Test/baseResults/spv.xfb2.vert.out
@@ -19,17 +19,17 @@ spv.xfb2.vert
                               MemberName 17(ComponentsBlock) 0  "c1"
                               MemberName 17(ComponentsBlock) 1  "c2"
                               Name 19  "components"
-                              MemberDecorate 8(gl_PerVertex) 0 Offset 16
-                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
                               Decorate 8(gl_PerVertex) Block
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 8(gl_PerVertex) 0 Offset 16
                               Decorate 10 XfbBuffer 3
                               Decorate 10 XfbStride 32
                               Decorate 14(position) Location 0
+                              Decorate 17(ComponentsBlock) Block
                               MemberDecorate 17(ComponentsBlock) 0 Offset 0
                               MemberDecorate 17(ComponentsBlock) 1 Offset 16
-                              Decorate 17(ComponentsBlock) Block
-                              Decorate 19(components) DescriptorSet 0
                               Decorate 19(components) Binding 5
+                              Decorate 19(components) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.xfb3.vert.out b/Test/baseResults/spv.xfb3.vert.out
index a7e88566..25e031a3 100644
--- a/Test/baseResults/spv.xfb3.vert.out
+++ b/Test/baseResults/spv.xfb3.vert.out
@@ -19,17 +19,17 @@ spv.xfb3.vert
                               MemberName 17(ComponentsBlock) 0  "c1"
                               MemberName 17(ComponentsBlock) 1  "c2"
                               Name 19  "components"
-                              MemberDecorate 8(gl_PerVertex) 0 Offset 16
-                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
                               Decorate 8(gl_PerVertex) Block
+                              MemberDecorate 8(gl_PerVertex) 0 BuiltIn Position
+                              MemberDecorate 8(gl_PerVertex) 0 Offset 16
                               Decorate 10 XfbBuffer 3
                               Decorate 10 XfbStride 80
                               Decorate 14(position) Location 0
+                              Decorate 17(ComponentsBlock) Block
                               MemberDecorate 17(ComponentsBlock) 0 Offset 0
                               MemberDecorate 17(ComponentsBlock) 1 Offset 16
-                              Decorate 17(ComponentsBlock) Block
-                              Decorate 19(components) DescriptorSet 0
                               Decorate 19(components) Binding 5
+                              Decorate 19(components) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/spv.xfbOffsetOnBlockMembersAssignment.vert.out b/Test/baseResults/spv.xfbOffsetOnBlockMembersAssignment.vert.out
index eb911002..23110016 100644
--- a/Test/baseResults/spv.xfbOffsetOnBlockMembersAssignment.vert.out
+++ b/Test/baseResults/spv.xfbOffsetOnBlockMembersAssignment.vert.out
@@ -23,17 +23,17 @@ spv.xfbOffsetOnBlockMembersAssignment.vert
                               Name 27  ""
                               Name 31  "gl_VertexID"
                               Name 32  "gl_InstanceID"
+                              Decorate 8(block2) Block
                               MemberDecorate 8(block2) 0 Offset 0
                               MemberDecorate 8(block2) 1 Offset 4
-                              Decorate 8(block2) Block
                               Decorate 10 Location 5
                               Decorate 10 XfbBuffer 2
                               Decorate 10 XfbStride 20
+                              Decorate 25(gl_PerVertex) Block
                               MemberDecorate 25(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 25(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 25(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 25(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 25(gl_PerVertex) Block
                               Decorate 27 XfbBuffer 0
                               Decorate 27 XfbStride 0
                               Decorate 31(gl_VertexID) BuiltIn VertexId
diff --git a/Test/baseResults/spv.xfbOffsetOnStructMembersAssignment.vert.out b/Test/baseResults/spv.xfbOffsetOnStructMembersAssignment.vert.out
index 467a5aec..c073ebec 100644
--- a/Test/baseResults/spv.xfbOffsetOnStructMembersAssignment.vert.out
+++ b/Test/baseResults/spv.xfbOffsetOnStructMembersAssignment.vert.out
@@ -28,18 +28,18 @@ spv.xfbOffsetOnStructMembersAssignment.vert
                               Name 38  "gl_VertexID"
                               Name 39  "gl_InstanceID"
                               Decorate 9(s1) Location 0
+                              Decorate 9(s1) Offset 16
                               Decorate 9(s1) XfbBuffer 2
                               Decorate 9(s1) XfbStride 24
-                              Decorate 9(s1) Offset 16
                               Decorate 21(s2) Location 5
+                              Decorate 21(s2) Offset 8
                               Decorate 21(s2) XfbBuffer 1
                               Decorate 21(s2) XfbStride 28
-                              Decorate 21(s2) Offset 8
+                              Decorate 32(gl_PerVertex) Block
                               MemberDecorate 32(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 32(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 32(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 32(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 32(gl_PerVertex) Block
                               Decorate 34 XfbBuffer 0
                               Decorate 34 XfbStride 0
                               Decorate 38(gl_VertexID) BuiltIn VertexId
diff --git a/Test/baseResults/spv.xfbOverlapOffsetCheckWithBlockAndMember.vert.out b/Test/baseResults/spv.xfbOverlapOffsetCheckWithBlockAndMember.vert.out
index 633558d4..b63226e3 100644
--- a/Test/baseResults/spv.xfbOverlapOffsetCheckWithBlockAndMember.vert.out
+++ b/Test/baseResults/spv.xfbOverlapOffsetCheckWithBlockAndMember.vert.out
@@ -25,19 +25,19 @@ spv.xfbOverlapOffsetCheckWithBlockAndMember.vert
                               Name 33  ""
                               Name 37  "gl_VertexID"
                               Name 38  "gl_InstanceID"
+                              Decorate 8(block2) Block
                               MemberDecorate 8(block2) 0 Offset 12
                               MemberDecorate 8(block2) 1 Offset 28
                               MemberDecorate 8(block2) 2 Offset 40
                               MemberDecorate 8(block2) 3 Offset 56
-                              Decorate 8(block2) Block
                               Decorate 10 Location 5
                               Decorate 10 XfbBuffer 3
                               Decorate 10 XfbStride 72
+                              Decorate 31(gl_PerVertex) Block
                               MemberDecorate 31(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 31(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 31(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 31(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 31(gl_PerVertex) Block
                               Decorate 33 XfbBuffer 0
                               Decorate 33 XfbStride 0
                               Decorate 37(gl_VertexID) BuiltIn VertexId
diff --git a/Test/baseResults/spv.xfbStrideJustOnce.vert.out b/Test/baseResults/spv.xfbStrideJustOnce.vert.out
index 8bf1f0d9..0548aee6 100644
--- a/Test/baseResults/spv.xfbStrideJustOnce.vert.out
+++ b/Test/baseResults/spv.xfbStrideJustOnce.vert.out
@@ -27,11 +27,11 @@ spv.xfbStrideJustOnce.vert
                               Decorate 10 Location 5
                               Decorate 10 XfbBuffer 2
                               Decorate 10 XfbStride 20
+                              Decorate 25(gl_PerVertex) Block
                               MemberDecorate 25(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 25(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 25(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 25(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 25(gl_PerVertex) Block
                               Decorate 27 XfbBuffer 0
                               Decorate 27 XfbStride 0
                               Decorate 31(gl_VertexID) BuiltIn VertexId
diff --git a/Test/baseResults/vk.relaxed.changeSet.vert.out b/Test/baseResults/vk.relaxed.changeSet.vert.out
index d7502a3a..339112d3 100755
--- a/Test/baseResults/vk.relaxed.changeSet.vert.out
+++ b/Test/baseResults/vk.relaxed.changeSet.vert.out
@@ -168,17 +168,17 @@ gl_FragCoord origin is upper left
                               Decorate 11(aColor) Location 2
                               Decorate 15(UV) Location 1
                               Decorate 17(aUV) Location 1
+                              Decorate 22(gl_PerVertex) Block
                               MemberDecorate 22(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 22(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 22(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 22(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 22(gl_PerVertex) Block
-                              MemberDecorate 28(gl_DefaultUniformBlock) 0 ColMajor
-                              MemberDecorate 28(gl_DefaultUniformBlock) 0 Offset 0
-                              MemberDecorate 28(gl_DefaultUniformBlock) 0 MatrixStride 16
                               Decorate 28(gl_DefaultUniformBlock) Block
-                              Decorate 30 DescriptorSet 0
+                              MemberDecorate 28(gl_DefaultUniformBlock) 0 ColMajor
+                              MemberDecorate 28(gl_DefaultUniformBlock) 0 MatrixStride 16
+                              MemberDecorate 28(gl_DefaultUniformBlock) 0 Offset 0
                               Decorate 30 Binding 0
+                              Decorate 30 DescriptorSet 0
                               Decorate 34(aPos) Location 0
                               Decorate 44(gl_VertexIndex) BuiltIn VertexIndex
                               Decorate 45(gl_InstanceIndex) BuiltIn InstanceIndex
@@ -248,8 +248,8 @@ gl_FragCoord origin is upper left
                               Name 20  "UV"
                               Decorate 9(fragColor) Location 0
                               Decorate 11(Color) Location 0
-                              Decorate 16(sTexture) DescriptorSet 1
                               Decorate 16(sTexture) Binding 0
+                              Decorate 16(sTexture) DescriptorSet 1
                               Decorate 20(UV) Location 1
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/vk.relaxed.frag.out b/Test/baseResults/vk.relaxed.frag.out
index 7aed8138..105eced6 100644
--- a/Test/baseResults/vk.relaxed.frag.out
+++ b/Test/baseResults/vk.relaxed.frag.out
@@ -728,31 +728,31 @@ gl_FragCoord origin is upper left
                               Name 196  "structUniform.samplers.tn[2]"
                               Name 197  "structUniform.samplers.tn[3]"
                               Name 198  "param"
+                              Decorate 34(gl_AtomicCounterBlock_0) BufferBlock
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 0 Volatile
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 0 Coherent
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 0 Offset 0
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 1 Volatile
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 1 Coherent
                               MemberDecorate 34(gl_AtomicCounterBlock_0) 1 Offset 4
-                              Decorate 34(gl_AtomicCounterBlock_0) BufferBlock
-                              Decorate 36 DescriptorSet 0
                               Decorate 36 Binding 9
+                              Decorate 36 DescriptorSet 0
+                              Decorate 78(gl_AtomicCounterBlock_1) BufferBlock
                               MemberDecorate 78(gl_AtomicCounterBlock_1) 0 Volatile
                               MemberDecorate 78(gl_AtomicCounterBlock_1) 0 Coherent
                               MemberDecorate 78(gl_AtomicCounterBlock_1) 0 Offset 0
-                              Decorate 78(gl_AtomicCounterBlock_1) BufferBlock
-                              Decorate 80 DescriptorSet 0
                               Decorate 80 Binding 10
+                              Decorate 80 DescriptorSet 0
+                              Decorate 89(UniformBlock) Block
                               MemberDecorate 89(UniformBlock) 0 Offset 0
                               MemberDecorate 89(UniformBlock) 1 Offset 16
-                              Decorate 89(UniformBlock) Block
-                              Decorate 91 DescriptorSet 0
                               Decorate 91 Binding 7
+                              Decorate 91 DescriptorSet 0
+                              Decorate 95(BufferBlock) BufferBlock
                               MemberDecorate 95(BufferBlock) 0 Offset 0
                               MemberDecorate 95(BufferBlock) 1 Offset 16
-                              Decorate 95(BufferBlock) BufferBlock
-                              Decorate 97(bufferInstance) DescriptorSet 0
                               Decorate 97(bufferInstance) Binding 8
+                              Decorate 97(bufferInstance) DescriptorSet 0
                               Decorate 103 ArrayStride 16
                               Decorate 104 ArrayStride 16
                               MemberDecorate 105(SamplerArray) 0 Offset 0
@@ -761,27 +761,27 @@ gl_FragCoord origin is upper left
                               MemberDecorate 106(e) 2 Offset 12
                               MemberDecorate 106(e) 3 Offset 16
                               MemberDecorate 106(e) 4 Offset 32
+                              Decorate 107(gl_DefaultUniformBlock) Block
                               MemberDecorate 107(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 107(gl_DefaultUniformBlock) 1 Offset 16
                               MemberDecorate 107(gl_DefaultUniformBlock) 2 Offset 24
                               MemberDecorate 107(gl_DefaultUniformBlock) 3 Offset 32
                               MemberDecorate 107(gl_DefaultUniformBlock) 4 Offset 192
-                              Decorate 107(gl_DefaultUniformBlock) Block
-                              Decorate 109 DescriptorSet 0
                               Decorate 109 Binding 0
-                              Decorate 151(t1) DescriptorSet 0
+                              Decorate 109 DescriptorSet 0
                               Decorate 151(t1) Binding 6
-                              Decorate 157(structUniform.t0) DescriptorSet 0
+                              Decorate 151(t1) DescriptorSet 0
                               Decorate 157(structUniform.t0) Binding 1
+                              Decorate 157(structUniform.t0) DescriptorSet 0
                               Decorate 190(o) Location 0
-                              Decorate 194(structUniform.samplers.tn[0]) DescriptorSet 0
                               Decorate 194(structUniform.samplers.tn[0]) Binding 2
-                              Decorate 195(structUniform.samplers.tn[1]) DescriptorSet 0
+                              Decorate 194(structUniform.samplers.tn[0]) DescriptorSet 0
                               Decorate 195(structUniform.samplers.tn[1]) Binding 3
-                              Decorate 196(structUniform.samplers.tn[2]) DescriptorSet 0
+                              Decorate 195(structUniform.samplers.tn[1]) DescriptorSet 0
                               Decorate 196(structUniform.samplers.tn[2]) Binding 4
-                              Decorate 197(structUniform.samplers.tn[3]) DescriptorSet 0
+                              Decorate 196(structUniform.samplers.tn[2]) DescriptorSet 0
                               Decorate 197(structUniform.samplers.tn[3]) Binding 5
+                              Decorate 197(structUniform.samplers.tn[3]) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeInt 32 0
diff --git a/Test/baseResults/vk.relaxed.link1.frag.out b/Test/baseResults/vk.relaxed.link1.frag.out
index 161d929b..7b114a78 100644
--- a/Test/baseResults/vk.relaxed.link1.frag.out
+++ b/Test/baseResults/vk.relaxed.link1.frag.out
@@ -378,6 +378,7 @@ gl_FragCoord origin is upper left
                               Name 68  "o"
                               Name 72  "j"
                               Name 79  "v"
+                              Decorate 16(gl_AtomicCounterBlock_0) BufferBlock
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 0 Volatile
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 0 Coherent
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 0 Offset 0
@@ -387,18 +388,17 @@ gl_FragCoord origin is upper left
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 2 Volatile
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 2 Coherent
                               MemberDecorate 16(gl_AtomicCounterBlock_0) 2 Offset 8
-                              Decorate 16(gl_AtomicCounterBlock_0) BufferBlock
-                              Decorate 18 DescriptorSet 0
                               Decorate 18 Binding 1
+                              Decorate 18 DescriptorSet 0
+                              Decorate 35(gl_DefaultUniformBlock) Block
                               MemberDecorate 35(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 35(gl_DefaultUniformBlock) 1 Offset 16
                               MemberDecorate 35(gl_DefaultUniformBlock) 2 Offset 24
                               MemberDecorate 35(gl_DefaultUniformBlock) 3 Offset 32
                               MemberDecorate 35(gl_DefaultUniformBlock) 4 Offset 48
                               MemberDecorate 35(gl_DefaultUniformBlock) 5 Offset 64
-                              Decorate 35(gl_DefaultUniformBlock) Block
-                              Decorate 37 DescriptorSet 0
                               Decorate 37 Binding 0
+                              Decorate 37 DescriptorSet 0
                               Decorate 68(o) Location 0
                2:             TypeVoid
                3:             TypeFunction 2
diff --git a/Test/baseResults/vk.relaxed.stagelink.0.0.vert.out b/Test/baseResults/vk.relaxed.stagelink.0.0.vert.out
index 37532ed6..d7d8be2f 100755
--- a/Test/baseResults/vk.relaxed.stagelink.0.0.vert.out
+++ b/Test/baseResults/vk.relaxed.stagelink.0.0.vert.out
@@ -7325,71 +7325,72 @@ gl_FragCoord origin is upper left
                               Name 934  "mTD3DImageOutputs"
                               Name 938  "mTDCubeImageOutputs"
                               Decorate 207(uv) Location 3
+                              Decorate 214(Vertex) Block
                               MemberDecorate 214(Vertex) 3 Flat
                               MemberDecorate 214(Vertex) 4 Flat
-                              Decorate 214(Vertex) Block
                               Decorate 216(oVert) Location 0
                               Decorate 226(P) Location 0
+                              Decorate 236(gl_PerVertex) Block
                               MemberDecorate 236(gl_PerVertex) 0 BuiltIn Position
                               MemberDecorate 236(gl_PerVertex) 1 BuiltIn PointSize
                               MemberDecorate 236(gl_PerVertex) 2 BuiltIn ClipDistance
                               MemberDecorate 236(gl_PerVertex) 3 BuiltIn CullDistance
-                              Decorate 236(gl_PerVertex) Block
                               Decorate 256(Cd) Location 2
                               MemberDecorate 269(TDMatrix) 0 ColMajor
-                              MemberDecorate 269(TDMatrix) 0 Offset 0
                               MemberDecorate 269(TDMatrix) 0 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 0 Offset 0
                               MemberDecorate 269(TDMatrix) 1 ColMajor
-                              MemberDecorate 269(TDMatrix) 1 Offset 64
                               MemberDecorate 269(TDMatrix) 1 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 1 Offset 64
                               MemberDecorate 269(TDMatrix) 2 ColMajor
-                              MemberDecorate 269(TDMatrix) 2 Offset 128
                               MemberDecorate 269(TDMatrix) 2 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 2 Offset 128
                               MemberDecorate 269(TDMatrix) 3 ColMajor
-                              MemberDecorate 269(TDMatrix) 3 Offset 192
                               MemberDecorate 269(TDMatrix) 3 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 3 Offset 192
                               MemberDecorate 269(TDMatrix) 4 ColMajor
-                              MemberDecorate 269(TDMatrix) 4 Offset 256
                               MemberDecorate 269(TDMatrix) 4 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 4 Offset 256
                               MemberDecorate 269(TDMatrix) 5 ColMajor
-                              MemberDecorate 269(TDMatrix) 5 Offset 320
                               MemberDecorate 269(TDMatrix) 5 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 5 Offset 320
                               MemberDecorate 269(TDMatrix) 6 ColMajor
-                              MemberDecorate 269(TDMatrix) 6 Offset 384
                               MemberDecorate 269(TDMatrix) 6 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 6 Offset 384
                               MemberDecorate 269(TDMatrix) 7 ColMajor
-                              MemberDecorate 269(TDMatrix) 7 Offset 448
                               MemberDecorate 269(TDMatrix) 7 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 7 Offset 448
                               MemberDecorate 269(TDMatrix) 8 ColMajor
-                              MemberDecorate 269(TDMatrix) 8 Offset 512
                               MemberDecorate 269(TDMatrix) 8 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 8 Offset 512
                               MemberDecorate 269(TDMatrix) 9 ColMajor
-                              MemberDecorate 269(TDMatrix) 9 Offset 576
                               MemberDecorate 269(TDMatrix) 9 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 9 Offset 576
                               MemberDecorate 269(TDMatrix) 10 ColMajor
-                              MemberDecorate 269(TDMatrix) 10 Offset 640
                               MemberDecorate 269(TDMatrix) 10 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 10 Offset 640
                               MemberDecorate 269(TDMatrix) 11 ColMajor
-                              MemberDecorate 269(TDMatrix) 11 Offset 704
                               MemberDecorate 269(TDMatrix) 11 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 11 Offset 704
                               MemberDecorate 269(TDMatrix) 12 ColMajor
-                              MemberDecorate 269(TDMatrix) 12 Offset 768
                               MemberDecorate 269(TDMatrix) 12 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 12 Offset 768
                               MemberDecorate 269(TDMatrix) 13 ColMajor
-                              MemberDecorate 269(TDMatrix) 13 Offset 832
                               MemberDecorate 269(TDMatrix) 13 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 13 Offset 832
                               MemberDecorate 269(TDMatrix) 14 ColMajor
-                              MemberDecorate 269(TDMatrix) 14 Offset 880
                               MemberDecorate 269(TDMatrix) 14 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 14 Offset 880
                               MemberDecorate 269(TDMatrix) 15 ColMajor
-                              MemberDecorate 269(TDMatrix) 15 Offset 928
                               MemberDecorate 269(TDMatrix) 15 MatrixStride 16
+                              MemberDecorate 269(TDMatrix) 15 Offset 928
                               Decorate 270 ArrayStride 976
-                              MemberDecorate 271(TDMatricesBlock) 0 Offset 0
                               Decorate 271(TDMatricesBlock) Block
-                              Decorate 273 DescriptorSet 0
+                              MemberDecorate 271(TDMatricesBlock) 0 Offset 0
                               Decorate 273 Binding 1
+                              Decorate 273 DescriptorSet 0
                               Decorate 297(gl_InstanceIndex) BuiltIn InstanceIndex
+                              Decorate 299(gl_DefaultUniformBlock) Block
                               MemberDecorate 299(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 299(gl_DefaultUniformBlock) 1 Offset 4
                               MemberDecorate 299(gl_DefaultUniformBlock) 2 Offset 8
@@ -7398,34 +7399,33 @@ gl_FragCoord origin is upper left
                               MemberDecorate 299(gl_DefaultUniformBlock) 5 Offset 32
                               MemberDecorate 299(gl_DefaultUniformBlock) 6 Offset 48
                               MemberDecorate 299(gl_DefaultUniformBlock) 7 Offset 64
-                              Decorate 299(gl_DefaultUniformBlock) Block
-                              Decorate 301 DescriptorSet 0
                               Decorate 301 Binding 0
-                              Decorate 371(sTDInstanceTexCoord) DescriptorSet 0
+                              Decorate 301 DescriptorSet 0
                               Decorate 371(sTDInstanceTexCoord) Binding 16
-                              Decorate 400(sTDInstanceT) DescriptorSet 0
+                              Decorate 371(sTDInstanceTexCoord) DescriptorSet 0
                               Decorate 400(sTDInstanceT) Binding 15
-                              Decorate 665(sTDInstanceColor) DescriptorSet 0
+                              Decorate 400(sTDInstanceT) DescriptorSet 0
                               Decorate 665(sTDInstanceColor) Binding 17
+                              Decorate 665(sTDInstanceColor) DescriptorSet 0
                               MemberDecorate 896(TDCameraInfo) 0 Offset 0
                               MemberDecorate 896(TDCameraInfo) 1 Offset 16
                               MemberDecorate 896(TDCameraInfo) 2 Offset 32
                               MemberDecorate 896(TDCameraInfo) 3 Offset 48
                               Decorate 897 ArrayStride 64
-                              MemberDecorate 898(TDCameraInfoBlock) 0 Offset 0
                               Decorate 898(TDCameraInfoBlock) Block
-                              Decorate 900 DescriptorSet 0
+                              MemberDecorate 898(TDCameraInfoBlock) 0 Offset 0
                               Decorate 900 Binding 0
+                              Decorate 900 DescriptorSet 0
                               MemberDecorate 901(TDGeneral) 0 Offset 0
                               MemberDecorate 901(TDGeneral) 1 Offset 16
                               MemberDecorate 901(TDGeneral) 2 Offset 32
                               MemberDecorate 901(TDGeneral) 3 Offset 48
                               MemberDecorate 901(TDGeneral) 4 Offset 64
                               MemberDecorate 901(TDGeneral) 5 Offset 80
-                              MemberDecorate 902(TDGeneralBlock) 0 Offset 0
                               Decorate 902(TDGeneralBlock) Block
-                              Decorate 904 DescriptorSet 0
+                              MemberDecorate 902(TDGeneralBlock) 0 Offset 0
                               Decorate 904 Binding 0
+                              Decorate 904 DescriptorSet 0
                               Decorate 905(N) Location 1
                               Decorate 906(gl_VertexIndex) BuiltIn VertexIndex
                               MemberDecorate 907(TDLight) 0 Offset 0
@@ -7437,44 +7437,44 @@ gl_FragCoord origin is upper left
                               MemberDecorate 907(TDLight) 6 Offset 96
                               MemberDecorate 907(TDLight) 7 Offset 112
                               MemberDecorate 907(TDLight) 8 ColMajor
-                              MemberDecorate 907(TDLight) 8 Offset 128
                               MemberDecorate 907(TDLight) 8 MatrixStride 16
+                              MemberDecorate 907(TDLight) 8 Offset 128
                               MemberDecorate 907(TDLight) 9 ColMajor
-                              MemberDecorate 907(TDLight) 9 Offset 192
                               MemberDecorate 907(TDLight) 9 MatrixStride 16
+                              MemberDecorate 907(TDLight) 9 Offset 192
                               MemberDecorate 907(TDLight) 10 Offset 256
                               MemberDecorate 907(TDLight) 11 ColMajor
-                              MemberDecorate 907(TDLight) 11 Offset 272
                               MemberDecorate 907(TDLight) 11 MatrixStride 16
+                              MemberDecorate 907(TDLight) 11 Offset 272
                               Decorate 908 ArrayStride 336
-                              MemberDecorate 909(TDLightBlock) 0 Offset 0
                               Decorate 909(TDLightBlock) Block
-                              Decorate 911 DescriptorSet 0
+                              MemberDecorate 909(TDLightBlock) 0 Offset 0
                               Decorate 911 Binding 0
+                              Decorate 911 DescriptorSet 0
                               MemberDecorate 912(TDEnvLight) 0 Offset 0
                               MemberDecorate 912(TDEnvLight) 1 ColMajor
-                              MemberDecorate 912(TDEnvLight) 1 Offset 16
                               MemberDecorate 912(TDEnvLight) 1 MatrixStride 16
+                              MemberDecorate 912(TDEnvLight) 1 Offset 16
                               Decorate 913 ArrayStride 64
-                              MemberDecorate 914(TDEnvLightBlock) 0 Offset 0
                               Decorate 914(TDEnvLightBlock) Block
-                              Decorate 916 DescriptorSet 0
+                              MemberDecorate 914(TDEnvLightBlock) 0 Offset 0
                               Decorate 916 Binding 0
+                              Decorate 916 DescriptorSet 0
                               Decorate 918 ArrayStride 16
+                              Decorate 919(TDEnvLightBuffer) BufferBlock
                               MemberDecorate 919(TDEnvLightBuffer) 0 Restrict
                               MemberDecorate 919(TDEnvLightBuffer) 0 NonWritable
                               MemberDecorate 919(TDEnvLightBuffer) 0 Offset 0
-                              Decorate 919(TDEnvLightBuffer) BufferBlock
-                              Decorate 922(uTDEnvLightBuffers) DescriptorSet 0
                               Decorate 922(uTDEnvLightBuffers) Binding 0
-                              Decorate 926(mTD2DImageOutputs) DescriptorSet 0
+                              Decorate 922(uTDEnvLightBuffers) DescriptorSet 0
                               Decorate 926(mTD2DImageOutputs) Binding 0
-                              Decorate 930(mTD2DArrayImageOutputs) DescriptorSet 0
+                              Decorate 926(mTD2DImageOutputs) DescriptorSet 0
                               Decorate 930(mTD2DArrayImageOutputs) Binding 0
-                              Decorate 934(mTD3DImageOutputs) DescriptorSet 0
+                              Decorate 930(mTD2DArrayImageOutputs) DescriptorSet 0
                               Decorate 934(mTD3DImageOutputs) Binding 0
-                              Decorate 938(mTDCubeImageOutputs) DescriptorSet 0
+                              Decorate 934(mTD3DImageOutputs) DescriptorSet 0
                               Decorate 938(mTDCubeImageOutputs) Binding 0
+                              Decorate 938(mTDCubeImageOutputs) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
@@ -8999,12 +8999,13 @@ gl_FragCoord origin is upper left
                               Name 1293  "TDEnvLightBuffer"
                               MemberName 1293(TDEnvLightBuffer) 0  "shCoeffs"
                               Name 1296  "uTDEnvLightBuffers"
+                              Decorate 334(Vertex) Block
                               MemberDecorate 334(Vertex) 3 Flat
                               MemberDecorate 334(Vertex) 4 Flat
-                              Decorate 334(Vertex) Block
                               Decorate 336(iVert) Location 0
-                              Decorate 363(sColorMap) DescriptorSet 0
                               Decorate 363(sColorMap) Binding 2
+                              Decorate 363(sColorMap) DescriptorSet 0
+                              Decorate 374(gl_DefaultUniformBlock) Block
                               MemberDecorate 374(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 374(gl_DefaultUniformBlock) 1 Offset 4
                               MemberDecorate 374(gl_DefaultUniformBlock) 2 Offset 8
@@ -9013,102 +9014,101 @@ gl_FragCoord origin is upper left
                               MemberDecorate 374(gl_DefaultUniformBlock) 5 Offset 32
                               MemberDecorate 374(gl_DefaultUniformBlock) 6 Offset 48
                               MemberDecorate 374(gl_DefaultUniformBlock) 7 Offset 64
-                              Decorate 374(gl_DefaultUniformBlock) Block
-                              Decorate 376 DescriptorSet 0
                               Decorate 376 Binding 0
+                              Decorate 376 DescriptorSet 0
                               Decorate 429(oFragColor) Location 0
-                              Decorate 456(sTDNoiseMap) DescriptorSet 0
                               Decorate 456(sTDNoiseMap) Binding 3
+                              Decorate 456(sTDNoiseMap) DescriptorSet 0
                               Decorate 458(gl_FragCoord) BuiltIn FragCoord
                               Decorate 485(gl_FrontFacing) BuiltIn FrontFacing
-                              Decorate 931(sTDInstanceTexCoord) DescriptorSet 0
                               Decorate 931(sTDInstanceTexCoord) Binding 16
-                              Decorate 958(sTDInstanceT) DescriptorSet 0
+                              Decorate 931(sTDInstanceTexCoord) DescriptorSet 0
                               Decorate 958(sTDInstanceT) Binding 15
-                              Decorate 1219(sTDInstanceColor) DescriptorSet 0
+                              Decorate 958(sTDInstanceT) DescriptorSet 0
                               Decorate 1219(sTDInstanceColor) Binding 17
+                              Decorate 1219(sTDInstanceColor) DescriptorSet 0
                               MemberDecorate 1253(TDMatrix) 0 ColMajor
-                              MemberDecorate 1253(TDMatrix) 0 Offset 0
                               MemberDecorate 1253(TDMatrix) 0 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 0 Offset 0
                               MemberDecorate 1253(TDMatrix) 1 ColMajor
-                              MemberDecorate 1253(TDMatrix) 1 Offset 64
                               MemberDecorate 1253(TDMatrix) 1 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 1 Offset 64
                               MemberDecorate 1253(TDMatrix) 2 ColMajor
-                              MemberDecorate 1253(TDMatrix) 2 Offset 128
                               MemberDecorate 1253(TDMatrix) 2 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 2 Offset 128
                               MemberDecorate 1253(TDMatrix) 3 ColMajor
-                              MemberDecorate 1253(TDMatrix) 3 Offset 192
                               MemberDecorate 1253(TDMatrix) 3 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 3 Offset 192
                               MemberDecorate 1253(TDMatrix) 4 ColMajor
-                              MemberDecorate 1253(TDMatrix) 4 Offset 256
                               MemberDecorate 1253(TDMatrix) 4 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 4 Offset 256
                               MemberDecorate 1253(TDMatrix) 5 ColMajor
-                              MemberDecorate 1253(TDMatrix) 5 Offset 320
                               MemberDecorate 1253(TDMatrix) 5 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 5 Offset 320
                               MemberDecorate 1253(TDMatrix) 6 ColMajor
-                              MemberDecorate 1253(TDMatrix) 6 Offset 384
                               MemberDecorate 1253(TDMatrix) 6 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 6 Offset 384
                               MemberDecorate 1253(TDMatrix) 7 ColMajor
-                              MemberDecorate 1253(TDMatrix) 7 Offset 448
                               MemberDecorate 1253(TDMatrix) 7 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 7 Offset 448
                               MemberDecorate 1253(TDMatrix) 8 ColMajor
-                              MemberDecorate 1253(TDMatrix) 8 Offset 512
                               MemberDecorate 1253(TDMatrix) 8 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 8 Offset 512
                               MemberDecorate 1253(TDMatrix) 9 ColMajor
-                              MemberDecorate 1253(TDMatrix) 9 Offset 576
                               MemberDecorate 1253(TDMatrix) 9 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 9 Offset 576
                               MemberDecorate 1253(TDMatrix) 10 ColMajor
-                              MemberDecorate 1253(TDMatrix) 10 Offset 640
                               MemberDecorate 1253(TDMatrix) 10 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 10 Offset 640
                               MemberDecorate 1253(TDMatrix) 11 ColMajor
-                              MemberDecorate 1253(TDMatrix) 11 Offset 704
                               MemberDecorate 1253(TDMatrix) 11 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 11 Offset 704
                               MemberDecorate 1253(TDMatrix) 12 ColMajor
-                              MemberDecorate 1253(TDMatrix) 12 Offset 768
                               MemberDecorate 1253(TDMatrix) 12 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 12 Offset 768
                               MemberDecorate 1253(TDMatrix) 13 ColMajor
-                              MemberDecorate 1253(TDMatrix) 13 Offset 832
                               MemberDecorate 1253(TDMatrix) 13 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 13 Offset 832
                               MemberDecorate 1253(TDMatrix) 14 ColMajor
-                              MemberDecorate 1253(TDMatrix) 14 Offset 880
                               MemberDecorate 1253(TDMatrix) 14 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 14 Offset 880
                               MemberDecorate 1253(TDMatrix) 15 ColMajor
-                              MemberDecorate 1253(TDMatrix) 15 Offset 928
                               MemberDecorate 1253(TDMatrix) 15 MatrixStride 16
+                              MemberDecorate 1253(TDMatrix) 15 Offset 928
                               Decorate 1254 ArrayStride 976
-                              MemberDecorate 1255(TDMatricesBlock) 0 Offset 0
                               Decorate 1255(TDMatricesBlock) Block
-                              Decorate 1257 DescriptorSet 0
+                              MemberDecorate 1255(TDMatricesBlock) 0 Offset 0
                               Decorate 1257 Binding 1
+                              Decorate 1257 DescriptorSet 0
                               MemberDecorate 1258(TDCameraInfo) 0 Offset 0
                               MemberDecorate 1258(TDCameraInfo) 1 Offset 16
                               MemberDecorate 1258(TDCameraInfo) 2 Offset 32
                               MemberDecorate 1258(TDCameraInfo) 3 Offset 48
                               Decorate 1259 ArrayStride 64
-                              MemberDecorate 1260(TDCameraInfoBlock) 0 Offset 0
                               Decorate 1260(TDCameraInfoBlock) Block
-                              Decorate 1262 DescriptorSet 0
+                              MemberDecorate 1260(TDCameraInfoBlock) 0 Offset 0
                               Decorate 1262 Binding 0
+                              Decorate 1262 DescriptorSet 0
                               MemberDecorate 1263(TDGeneral) 0 Offset 0
                               MemberDecorate 1263(TDGeneral) 1 Offset 16
                               MemberDecorate 1263(TDGeneral) 2 Offset 32
                               MemberDecorate 1263(TDGeneral) 3 Offset 48
                               MemberDecorate 1263(TDGeneral) 4 Offset 64
                               MemberDecorate 1263(TDGeneral) 5 Offset 80
-                              MemberDecorate 1264(TDGeneralBlock) 0 Offset 0
                               Decorate 1264(TDGeneralBlock) Block
-                              Decorate 1266 DescriptorSet 0
+                              MemberDecorate 1264(TDGeneralBlock) 0 Offset 0
                               Decorate 1266 Binding 0
-                              Decorate 1270(sTDSineLookup) DescriptorSet 0
+                              Decorate 1266 DescriptorSet 0
                               Decorate 1270(sTDSineLookup) Binding 0
-                              Decorate 1271(sTDWhite2D) DescriptorSet 0
+                              Decorate 1270(sTDSineLookup) DescriptorSet 0
                               Decorate 1271(sTDWhite2D) Binding 0
-                              Decorate 1275(sTDWhite3D) DescriptorSet 0
+                              Decorate 1271(sTDWhite2D) DescriptorSet 0
                               Decorate 1275(sTDWhite3D) Binding 0
-                              Decorate 1276(sTDWhite2DArray) DescriptorSet 0
+                              Decorate 1275(sTDWhite3D) DescriptorSet 0
                               Decorate 1276(sTDWhite2DArray) Binding 0
-                              Decorate 1280(sTDWhiteCube) DescriptorSet 0
+                              Decorate 1276(sTDWhite2DArray) DescriptorSet 0
                               Decorate 1280(sTDWhiteCube) Binding 0
+                              Decorate 1280(sTDWhiteCube) DescriptorSet 0
                               MemberDecorate 1281(TDLight) 0 Offset 0
                               MemberDecorate 1281(TDLight) 1 Offset 16
                               MemberDecorate 1281(TDLight) 2 Offset 32
@@ -9118,36 +9118,36 @@ gl_FragCoord origin is upper left
                               MemberDecorate 1281(TDLight) 6 Offset 96
                               MemberDecorate 1281(TDLight) 7 Offset 112
                               MemberDecorate 1281(TDLight) 8 ColMajor
-                              MemberDecorate 1281(TDLight) 8 Offset 128
                               MemberDecorate 1281(TDLight) 8 MatrixStride 16
+                              MemberDecorate 1281(TDLight) 8 Offset 128
                               MemberDecorate 1281(TDLight) 9 ColMajor
-                              MemberDecorate 1281(TDLight) 9 Offset 192
                               MemberDecorate 1281(TDLight) 9 MatrixStride 16
+                              MemberDecorate 1281(TDLight) 9 Offset 192
                               MemberDecorate 1281(TDLight) 10 Offset 256
                               MemberDecorate 1281(TDLight) 11 ColMajor
-                              MemberDecorate 1281(TDLight) 11 Offset 272
                               MemberDecorate 1281(TDLight) 11 MatrixStride 16
+                              MemberDecorate 1281(TDLight) 11 Offset 272
                               Decorate 1282 ArrayStride 336
-                              MemberDecorate 1283(TDLightBlock) 0 Offset 0
                               Decorate 1283(TDLightBlock) Block
-                              Decorate 1285 DescriptorSet 0
+                              MemberDecorate 1283(TDLightBlock) 0 Offset 0
                               Decorate 1285 Binding 0
+                              Decorate 1285 DescriptorSet 0
                               MemberDecorate 1286(TDEnvLight) 0 Offset 0
                               MemberDecorate 1286(TDEnvLight) 1 ColMajor
-                              MemberDecorate 1286(TDEnvLight) 1 Offset 16
                               MemberDecorate 1286(TDEnvLight) 1 MatrixStride 16
+                              MemberDecorate 1286(TDEnvLight) 1 Offset 16
                               Decorate 1287 ArrayStride 64
-                              MemberDecorate 1288(TDEnvLightBlock) 0 Offset 0
                               Decorate 1288(TDEnvLightBlock) Block
-                              Decorate 1290 DescriptorSet 0
+                              MemberDecorate 1288(TDEnvLightBlock) 0 Offset 0
                               Decorate 1290 Binding 0
+                              Decorate 1290 DescriptorSet 0
                               Decorate 1292 ArrayStride 16
+                              Decorate 1293(TDEnvLightBuffer) BufferBlock
                               MemberDecorate 1293(TDEnvLightBuffer) 0 Restrict
                               MemberDecorate 1293(TDEnvLightBuffer) 0 NonWritable
                               MemberDecorate 1293(TDEnvLightBuffer) 0 Offset 0
-                              Decorate 1293(TDEnvLightBuffer) BufferBlock
-                              Decorate 1296(uTDEnvLightBuffers) DescriptorSet 0
                               Decorate 1296(uTDEnvLightBuffers) Binding 0
+                              Decorate 1296(uTDEnvLightBuffers) DescriptorSet 0
                2:             TypeVoid
                3:             TypeFunction 2
                6:             TypeFloat 32
diff --git a/Test/baseResults/vk.relaxed.stagelink.vert.out b/Test/baseResults/vk.relaxed.stagelink.vert.out
index a9b96831..99da5419 100644
--- a/Test/baseResults/vk.relaxed.stagelink.vert.out
+++ b/Test/baseResults/vk.relaxed.stagelink.vert.out
@@ -465,6 +465,7 @@ gl_FragCoord origin is upper left
                               Name 72  "gl_VertexIndex"
                               Name 82  "gl_InstanceIndex"
                               Name 90  "io"
+                              Decorate 14(gl_AtomicCounterBlock_0) BufferBlock
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Volatile
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Coherent
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Offset 0
@@ -474,10 +475,10 @@ gl_FragCoord origin is upper left
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Volatile
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Coherent
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Offset 8
-                              Decorate 14(gl_AtomicCounterBlock_0) BufferBlock
-                              Decorate 16 DescriptorSet 0
                               Decorate 16 Binding 1
+                              Decorate 16 DescriptorSet 0
                               Decorate 34 ArrayStride 16
+                              Decorate 35(gl_DefaultUniformBlock) Block
                               MemberDecorate 35(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 35(gl_DefaultUniformBlock) 1 Offset 16
                               MemberDecorate 35(gl_DefaultUniformBlock) 2 Offset 24
@@ -485,9 +486,8 @@ gl_FragCoord origin is upper left
                               MemberDecorate 35(gl_DefaultUniformBlock) 4 Offset 48
                               MemberDecorate 35(gl_DefaultUniformBlock) 5 Offset 64
                               MemberDecorate 35(gl_DefaultUniformBlock) 6 Offset 128
-                              Decorate 35(gl_DefaultUniformBlock) Block
-                              Decorate 37 DescriptorSet 0
                               Decorate 37 Binding 0
+                              Decorate 37 DescriptorSet 0
                               Decorate 72(gl_VertexIndex) BuiltIn VertexIndex
                               Decorate 82(gl_InstanceIndex) BuiltIn InstanceIndex
                               Decorate 90(io) Location 0
@@ -619,6 +619,7 @@ gl_FragCoord origin is upper left
                               Name 37  ""
                               Name 68  "o"
                               Name 70  "io"
+                              Decorate 14(gl_AtomicCounterBlock_0) BufferBlock
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Volatile
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Coherent
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 0 Offset 0
@@ -628,10 +629,10 @@ gl_FragCoord origin is upper left
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Volatile
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Coherent
                               MemberDecorate 14(gl_AtomicCounterBlock_0) 2 Offset 8
-                              Decorate 14(gl_AtomicCounterBlock_0) BufferBlock
-                              Decorate 16 DescriptorSet 0
                               Decorate 16 Binding 1
+                              Decorate 16 DescriptorSet 0
                               Decorate 34 ArrayStride 16
+                              Decorate 35(gl_DefaultUniformBlock) Block
                               MemberDecorate 35(gl_DefaultUniformBlock) 0 Offset 0
                               MemberDecorate 35(gl_DefaultUniformBlock) 1 Offset 16
                               MemberDecorate 35(gl_DefaultUniformBlock) 2 Offset 24
@@ -639,9 +640,8 @@ gl_FragCoord origin is upper left
                               MemberDecorate 35(gl_DefaultUniformBlock) 4 Offset 48
                               MemberDecorate 35(gl_DefaultUniformBlock) 5 Offset 64
                               MemberDecorate 35(gl_DefaultUniformBlock) 6 Offset 128
-                              Decorate 35(gl_DefaultUniformBlock) Block
-                              Decorate 37 DescriptorSet 0
                               Decorate 37 Binding 0
+                              Decorate 37 DescriptorSet 0
                               Decorate 68(o) Location 0
                               Decorate 70(io) Location 0
                2:             TypeVoid
diff --git a/Test/spv.multiple.var.same.const.frag b/Test/spv.multiple.var.same.const.frag
new file mode 100644
index 00000000..ead9a3cf
--- /dev/null
+++ b/Test/spv.multiple.var.same.const.frag
@@ -0,0 +1,6 @@
+#version 320 es
+precision mediump float;
+const float var0 = 1e-6;
+const float var1 = 1e-6;
+void main(){}
+
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index 77e9cccf..8bf679d4 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -551,6 +551,7 @@ INSTANTIATE_TEST_SUITE_P(
         "spv.floatFetch.frag",
         "spv.atomicRvalue.error.vert",
         "spv.sampledImageBlock.frag",
+        "spv.multiple.var.same.const.frag",
     })),
     FileNameAsCustomTestSuffix
 );