SPV Version: Emit the requested SPIR-V version, not the header version.

Fixes #1236.

SPIRV/GlslangToSpv.cpp

@@ -107,7 +107,8 @@ private:
 //
 class TGlslangToSpvTraverser : public glslang::TIntermTraverser {
 public:
-    TGlslangToSpvTraverser(const glslang::TIntermediate*, spv::SpvBuildLogger* logger, glslang::SpvOptions& options);
+    TGlslangToSpvTraverser(unsigned int spvVersion, const glslang::TIntermediate*, spv::SpvBuildLogger* logger,
+        glslang::SpvOptions& options);
     virtual ~TGlslangToSpvTraverser() { }
 
     bool visitAggregate(glslang::TVisit, glslang::TIntermAggregate*);
@@ -880,13 +881,13 @@ bool HasNonLayoutQualifiers(const glslang::TType& type, const glslang::TQualifie
 // Implement the TGlslangToSpvTraverser class.
 //
 
-TGlslangToSpvTraverser::TGlslangToSpvTraverser(const glslang::TIntermediate* glslangIntermediate,
+TGlslangToSpvTraverser::TGlslangToSpvTraverser(unsigned int spvVersion, const glslang::TIntermediate* glslangIntermediate,
                                                spv::SpvBuildLogger* buildLogger, glslang::SpvOptions& options)
     : TIntermTraverser(true, false, true),
       options(options),
       shaderEntry(nullptr), currentFunction(nullptr),
       sequenceDepth(0), logger(buildLogger),
-      builder((glslang::GetKhronosToolId() << 16) | glslang::GetSpirvGeneratorVersion(), logger),
+      builder(spvVersion, (glslang::GetKhronosToolId() << 16) | glslang::GetSpirvGeneratorVersion(), logger),
       inEntryPoint(false), entryPointTerminated(false), linkageOnly(false),
       glslangIntermediate(glslangIntermediate)
 {
@@ -6067,7 +6068,7 @@ void GlslangToSpv(const glslang::TIntermediate& intermediate, std::vector<unsign
 
     glslang::GetThreadPoolAllocator().push();
 
-    TGlslangToSpvTraverser it(&intermediate, logger, *options);
+    TGlslangToSpvTraverser it(intermediate.getSpv().spv, &intermediate, logger, *options);
     root->traverse(&it);
     it.finishSpv();
     it.dumpSpv(spirv);

SPIRV/SpvBuilder.cpp

@@ -56,7 +56,8 @@
 
 namespace spv {
 
-Builder::Builder(unsigned int magicNumber, SpvBuildLogger* buildLogger) :
+Builder::Builder(unsigned int spvVersion, unsigned int magicNumber, SpvBuildLogger* buildLogger) :
+    spvVersion(spvVersion),
     source(SourceLanguageUnknown),
     sourceVersion(0),
     sourceFileStringId(NoResult),
@@ -2403,7 +2404,7 @@ void Builder::dump(std::vector<unsigned int>& out) const
 {
     // Header, before first instructions:
     out.push_back(MagicNumber);
-    out.push_back(Version);
+    out.push_back(spvVersion);
     out.push_back(builderNumber);
     out.push_back(uniqueId + 1);
     out.push_back(0);

SPIRV/SpvBuilder.h

@@ -60,7 +60,7 @@ namespace spv {
 
 class Builder {
 public:
-    Builder(unsigned int userNumber, SpvBuildLogger* logger);
+    Builder(unsigned int spvVersion, unsigned int userNumber, SpvBuildLogger* logger);
     virtual ~Builder();
 
     static const int maxMatrixSize = 4;
@@ -585,6 +585,7 @@ public:
     void dumpInstructions(std::vector<unsigned int>&, const std::vector<std::unique_ptr<Instruction> >&) const;
     void dumpModuleProcesses(std::vector<unsigned int>&) const;
 
+    unsigned int spvVersion;     // the version of SPIR-V to emit in the header
     SourceLanguage source;
     int sourceVersion;
     spv::Id sourceFileStringId;

StandAlone/StandAlone.cpp

@@ -159,7 +159,7 @@ std::vector<std::string> IncludeDirectoryList;
 int ClientInputSemanticsVersion = 100;   // maps to, say, #define VULKAN 100
 int VulkanClientVersion = 100;           // would map to, say, Vulkan 1.0
 int OpenGLClientVersion = 450;           // doesn't influence anything yet, but maps to OpenGL 4.50
-unsigned int TargetVersion = 0x00001000; // maps to, say, SPIR-V 1.0
+unsigned int TargetVersion = 0x00010000; // maps to, say, SPIR-V 1.0
 std::vector<std::string> Processes;      // what should be recorded by OpModuleProcessed, or equivalent
 
 // Per descriptor-set binding base data

Test/baseLegalResults/hlsl.aliasOpaque.frag.out

@@ -1,6 +1,6 @@
 hlsl.aliasOpaque.frag
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 87
 

Test/baseLegalResults/hlsl.flattenOpaque.frag.out

@@ -1,6 +1,6 @@
 hlsl.flattenOpaque.frag
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 185
 

Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out

@@ -1,6 +1,6 @@
 hlsl.flattenOpaqueInit.vert
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 134
 

Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out

@@ -1,6 +1,6 @@
 hlsl.flattenOpaqueInitMix.vert
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 80
 

Test/baseLegalResults/hlsl.flattenSubset.frag.out

@@ -1,6 +1,6 @@
 hlsl.flattenSubset.frag
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 66
 

Test/baseLegalResults/hlsl.flattenSubset2.frag.out

@@ -1,6 +1,6 @@
 hlsl.flattenSubset2.frag
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 

Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out

@@ -1,6 +1,6 @@
 hlsl.partialFlattenLocal.vert
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 165
 

Test/baseLegalResults/hlsl.partialFlattenMixed.vert.out

@@ -1,6 +1,6 @@
 hlsl.partialFlattenMixed.vert
 WARNING: AST will form illegal SPIR-V; need to transform to legalize
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 36
 

Test/baseResults/glsl.entryPointRename.vert.bad.out

@@ -1,7 +1,7 @@
 glsl.entryPointRename.vert
 ERROR: Source entry point must be "main"
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 

Test/baseResults/glsl.entryPointRename.vert.out

@@ -1,5 +1,5 @@
 glsl.entryPointRename.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 

Test/baseResults/glspv.version.frag.out

@@ -1,7 +1,7 @@
 glspv.version.frag
 ERROR: #version: compilation for SPIR-V does not support the compatibility profile
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 6
 

Test/baseResults/hlsl.PointSize.geom.out

@@ -69,7 +69,7 @@ output primitive = line_strip
 0:?     'ps' ( in 3-element array of uint PointSize)
 0:?     'OutputStream.ps' ( out float PointSize)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 36
 

Test/baseResults/hlsl.PointSize.vert.out

@@ -37,7 +37,7 @@ Shader version: 500
 0:?   Linker Objects
 0:?     '@entryPointOutput' ( out float PointSize)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 16
 

Test/baseResults/hlsl.aliasOpaque.frag.out

@@ -142,7 +142,7 @@ gl_FragCoord origin is upper left
 0:?     'gtex' ( uniform texture2D)
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 64
 

Test/baseResults/hlsl.amend.frag.out

@@ -159,7 +159,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float a,  uniform float b,  uniform 3-component vector of float c,  uniform int d,  uniform int e})
 0:?     'm' ( global 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 57
 

Test/baseResults/hlsl.array.flatten.frag.out

@@ -344,7 +344,7 @@ gl_FragCoord origin is upper left
 0:?     'not_flattened_a' ( global 5-element array of int)
 0:?     'ps_output.color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 143
 

Test/baseResults/hlsl.array.frag.out

@@ -289,7 +289,7 @@ gl_FragCoord origin is upper left
 0:?     'i' (layout( location=0) flat in int)
 0:?     'input' (layout( location=1) in 3-element array of 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 126
 

Test/baseResults/hlsl.array.implicit-size.frag.out

@@ -162,7 +162,7 @@ gl_FragCoord origin is upper left
 0:?     'g_array_unused' ( global 7-element array of float)
 0:?     'g_mystruct' ( global 2-element array of structure{ temp int i,  temp float f})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 72
 

Test/baseResults/hlsl.array.multidim.frag.out

@@ -133,7 +133,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 5-element array of 4-element array of 3-element array of float float_array})
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 57
 

Test/baseResults/hlsl.assoc.frag.out

@@ -131,7 +131,7 @@ gl_FragCoord origin is upper left
 0:?     'a4' (layout( location=3) in 4-component vector of float)
 0:?     'a5' (layout( location=4) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 58
 

Test/baseResults/hlsl.attribute.expression.comp.out

@@ -81,7 +81,7 @@ local_size = (4, 6, 8)
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int bound})
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 

Test/baseResults/hlsl.attribute.frag.out

@@ -49,7 +49,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'input' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 

Test/baseResults/hlsl.attributeC11.frag.out

@@ -93,7 +93,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=7) out 4-component vector of float)
 0:?     'input' (layout( location=8) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 51
 

Test/baseResults/hlsl.attributeGlobalBuffer.frag.out

@@ -55,7 +55,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( set=2 binding=5 row_major std140) uniform block{ uniform 4-component vector of float u1,  uniform 4-component vector of float u2})
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 28
 

Test/baseResults/hlsl.basic.comp.out

@@ -59,7 +59,7 @@ local_size = (1, 1, 1)
 0:?     'dti' ( in int GlobalInvocationID)
 0:?     'gti' ( in int LocalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 

Test/baseResults/hlsl.basic.geom.out

@@ -187,7 +187,7 @@ output primitive = line_strip
 0:?     'OutputStream.myfloat' (layout( location=0) out float)
 0:?     'OutputStream.something' (layout( location=1) out int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 68
 

Test/baseResults/hlsl.boolConv.vert.out

@@ -203,7 +203,7 @@ Shader version: 500
 0:?     'b' ( global bool)
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 99
 

Test/baseResults/hlsl.buffer.frag.out

@@ -145,7 +145,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.a' (layout( location=0) out 4-component vector of float)
 0:?     'input' ( in 4-component vector of float FragCoord)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 73
 

Test/baseResults/hlsl.calculatelod.dx10.frag.out

@@ -355,7 +355,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 148
 

Test/baseResults/hlsl.cast.frag.out

@@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'input' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 

Test/baseResults/hlsl.cbuffer-identifier.vert.out

@@ -249,7 +249,7 @@ Shader version: 500
 0:?     'input.Pos' (layout( location=0) in 4-component vector of float)
 0:?     'input.Norm' (layout( location=1) in 3-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 106
 

Test/baseResults/hlsl.charLit.vert.out

@@ -145,7 +145,7 @@ Shader version: 500
 0:?   Linker Objects
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 58
 

Test/baseResults/hlsl.clip.frag.out

@@ -73,7 +73,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 30
 

Test/baseResults/hlsl.clipdistance-1.frag.out

@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
 0:?     'clip' ( in 1-element array of float ClipDistance)
 0:?     'cull' ( in 1-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 

Test/baseResults/hlsl.clipdistance-1.geom.out

@@ -549,7 +549,7 @@ output primitive = line_strip
 0:?     'clip' ( in 3-element array of 4-element array of float ClipDistance)
 0:?     'OutputStream.clip' ( out 2-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 118
 

Test/baseResults/hlsl.clipdistance-1.vert.out

@@ -107,7 +107,7 @@ Shader version: 500
 0:?     'clip' ( out 1-element array of float ClipDistance)
 0:?     'cull' ( out 1-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 46
 

Test/baseResults/hlsl.clipdistance-2.frag.out

@@ -289,7 +289,7 @@ gl_FragCoord origin is upper left
 0:?     'clip' ( in 4-element array of float ClipDistance)
 0:?     'cull' ( in 4-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 84
 

Test/baseResults/hlsl.clipdistance-2.geom.out

@@ -723,7 +723,7 @@ output primitive = line_strip
 0:?     'clip' ( in 3-element array of 4-element array of float ClipDistance)
 0:?     'OutputStream.clip' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 128
 

Test/baseResults/hlsl.clipdistance-2.vert.out

@@ -419,7 +419,7 @@ Shader version: 500
 0:?     'clip' ( out 4-element array of float ClipDistance)
 0:?     'cull' ( out 4-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 89
 

Test/baseResults/hlsl.clipdistance-3.frag.out

@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
 0:?     'clip' ( in 2-element array of float ClipDistance)
 0:?     'cull' ( in 2-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 

Test/baseResults/hlsl.clipdistance-3.geom.out

@@ -629,7 +629,7 @@ output primitive = line_strip
 0:?     'clip' ( in 3-element array of 4-element array of float ClipDistance)
 0:?     'OutputStream.clip1' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 127
 

Test/baseResults/hlsl.clipdistance-3.vert.out

@@ -135,7 +135,7 @@ Shader version: 500
 0:?     'clip' ( out 2-element array of float ClipDistance)
 0:?     'cull' ( out 2-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 51
 

Test/baseResults/hlsl.clipdistance-4.frag.out

@@ -173,7 +173,7 @@ gl_FragCoord origin is upper left
 0:?     'v.Position' ( in 4-component vector of float FragCoord)
 0:?     'v.ClipRect' ( in 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 57
 

Test/baseResults/hlsl.clipdistance-4.geom.out

@@ -611,7 +611,7 @@ output primitive = line_strip
 0:?     'clip0' ( in 3-element array of 4-element array of float ClipDistance)
 0:?     'OutputStream.clip1' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 130
 

Test/baseResults/hlsl.clipdistance-4.vert.out

@@ -269,7 +269,7 @@ Shader version: 500
 0:?     'v.Position' (layout( location=0) in 4-component vector of float)
 0:?     '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 72
 

Test/baseResults/hlsl.clipdistance-5.frag.out

@@ -231,7 +231,7 @@ gl_FragCoord origin is upper left
 0:?     'v.Position' ( in 4-component vector of float FragCoord)
 0:?     'v.ClipRect' ( in 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 62
 

Test/baseResults/hlsl.clipdistance-5.vert.out

@@ -317,7 +317,7 @@ Shader version: 500
 0:?     'v.Position' (layout( location=0) in 4-component vector of float)
 0:?     '@entryPointOutput.ClipRect' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 73
 

Test/baseResults/hlsl.clipdistance-6.frag.out

@@ -281,7 +281,7 @@ gl_FragCoord origin is upper left
 0:?     'v.Position' ( in 4-component vector of float FragCoord)
 0:?     'v.clip1' ( in 8-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 79
 

Test/baseResults/hlsl.clipdistance-6.vert.out

@@ -427,7 +427,7 @@ Shader version: 500
 0:?     '@entryPointOutput.Position' ( out 4-component vector of float Position)
 0:?     '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 86
 

Test/baseResults/hlsl.clipdistance-7.frag.out

@@ -269,7 +269,7 @@ gl_FragCoord origin is upper left
 0:?     'v.Position' ( in 4-component vector of float FragCoord)
 0:?     'v.clip1' ( in 8-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 78
 

Test/baseResults/hlsl.clipdistance-7.vert.out

@@ -383,7 +383,7 @@ Shader version: 500
 0:?     '@entryPointOutput.Position' ( out 4-component vector of float Position)
 0:?     '@entryPointOutput.clip1' ( out 8-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 81
 

Test/baseResults/hlsl.clipdistance-8.frag.out

@@ -185,7 +185,7 @@ gl_FragCoord origin is upper left
 0:?     'v.Position' ( in 4-component vector of float FragCoord)
 0:?     'v.clip1' ( in 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 65
 

Test/baseResults/hlsl.clipdistance-8.vert.out

@@ -239,7 +239,7 @@ Shader version: 500
 0:?     '@entryPointOutput.Position' ( out 4-component vector of float Position)
 0:?     '@entryPointOutput.clip1' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 62
 

Test/baseResults/hlsl.clipdistance-9.frag.out

@@ -143,7 +143,7 @@ gl_FragCoord origin is upper left
 0:?     'Position' ( in 4-component vector of float FragCoord)
 0:?     'clip0' ( in 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 68
 

Test/baseResults/hlsl.clipdistance-9.vert.out

@@ -193,7 +193,7 @@ Shader version: 500
 0:?     '@entryPointOutput.Position' ( out 4-component vector of float Position)
 0:?     'clip0' ( out 4-element array of float ClipDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 67
 

Test/baseResults/hlsl.color.hull.tesc.out

@@ -355,7 +355,7 @@ triangle order = cw
 0:?     '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter)
 0:?     '@patchConstantOutput.inside' ( patch out 2-element array of float TessLevelInner)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 127
 

Test/baseResults/hlsl.comparison.vec.frag.out

@@ -261,7 +261,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float uf4})
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 96
 

Test/baseResults/hlsl.conditional.frag.out

@@ -521,7 +521,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'input' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 220
 

Test/baseResults/hlsl.constantbuffer.frag.out

@@ -131,7 +131,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform int c1})
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 66
 

Test/baseResults/hlsl.constructArray.vert.out

@@ -267,7 +267,7 @@ Shader version: 500
 0:?   Linker Objects
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 89
 

Test/baseResults/hlsl.constructexpr.frag.out

@@ -103,7 +103,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     '@entryPointOutput.color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 40
 

Test/baseResults/hlsl.constructimat.frag.out

@@ -543,7 +543,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 98
 

Test/baseResults/hlsl.dashI.vert.out

@@ -1,5 +1,5 @@
 hlsl.dashI.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 40
 

Test/baseResults/hlsl.deadFunctionMissingBody.vert.out

@@ -1,5 +1,5 @@
 hlsl.deadFunctionMissingBody.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 18
 

Test/baseResults/hlsl.depthGreater.frag.out

@@ -49,7 +49,7 @@ using depth_greater
 0:?   Linker Objects
 0:?     'depth' ( out float FragDepth)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 

Test/baseResults/hlsl.depthLess.frag.out

@@ -41,7 +41,7 @@ using depth_less
 0:?   Linker Objects
 0:?     '@entryPointOutput' ( out float FragDepth)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 16
 

Test/baseResults/hlsl.discard.frag.out

@@ -107,7 +107,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'input' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 

Test/baseResults/hlsl.doLoop.frag.out

@@ -143,7 +143,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'input' (layout( location=0) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 71
 

Test/baseResults/hlsl.domain.1.tese.out

@@ -285,7 +285,7 @@ triangle order = none
 0:?     'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter)
 0:?     'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 103
 

Test/baseResults/hlsl.domain.2.tese.out

@@ -283,7 +283,7 @@ triangle order = none
 0:?     'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner)
 0:?     'pcf_data.foo' (layout( location=2) patch in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 98
 

Test/baseResults/hlsl.domain.3.tese.out

@@ -263,7 +263,7 @@ triangle order = none
 0:?     'pcf_data.flTessFactor' ( patch in 4-element array of float TessLevelOuter)
 0:?     'pcf_data.flInsideTessFactor' ( patch in 2-element array of float TessLevelInner)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 100
 

Test/baseResults/hlsl.emptystruct.init.vert.out

@@ -59,7 +59,7 @@ Shader version: 500
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'vertexIndex' (layout( location=0) in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 29
 

Test/baseResults/hlsl.emptystructreturn.frag.out

@@ -49,7 +49,7 @@ gl_FragCoord origin is upper left
 0:?             'i' ( temp structure{})
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 

Test/baseResults/hlsl.emptystructreturn.vert.out

@@ -47,7 +47,7 @@ Shader version: 500
 0:?             'i' ( temp structure{})
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 

Test/baseResults/hlsl.entry-in.frag.out

@@ -165,7 +165,7 @@ gl_FragCoord origin is upper left
 0:?     'i.v' (layout( location=0) in 2-component vector of float)
 0:?     'i.i2' (layout( location=1) flat in 2-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 74
 

Test/baseResults/hlsl.entry-out.frag.out

@@ -243,7 +243,7 @@ gl_FragCoord origin is upper left
 0:?     'out3.v' (layout( location=4) out 2-component vector of float)
 0:?     'out3.i' (layout( location=5) out 2-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 89
 

Test/baseResults/hlsl.entry.rename.frag.out

@@ -71,7 +71,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int also_not_the_entry_point})
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 32
 

Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out

@@ -1,5 +1,5 @@
 hlsl.explicitDescriptorSet.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 31
 

Test/baseResults/hlsl.explicitDescriptorSet.frag.out

@@ -1,5 +1,5 @@
 hlsl.explicitDescriptorSet.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 31
 

Test/baseResults/hlsl.flatten.return.frag.out

@@ -117,7 +117,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.other_struct_member2' (layout( location=2) out float)
 0:?     '@entryPointOutput.other_struct_member3' (layout( location=3) out float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 49
 

Test/baseResults/hlsl.flattenOpaque.frag.out

@@ -294,7 +294,7 @@ gl_FragCoord origin is upper left
 0:?     's2.tex' ( uniform texture2D)
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 122
 

Test/baseResults/hlsl.flattenOpaqueInit.vert.out

@@ -164,7 +164,7 @@ Shader version: 500
 0:?     'g_tInputTexture' ( uniform texture2D)
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 82
 

Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out

@@ -106,7 +106,7 @@ Shader version: 500
 0:?     'g_tInputTexture' ( uniform texture2D)
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 59
 

Test/baseResults/hlsl.flattenSubset.frag.out

@@ -114,7 +114,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'vpos' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 54
 

Test/baseResults/hlsl.flattenSubset2.frag.out

@@ -148,7 +148,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'vpos' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 56
 

Test/baseResults/hlsl.float1.frag.out

@@ -64,7 +64,7 @@ gl_FragCoord origin is upper left
 0:?     'f1' ( global 1-component vector of float)
 0:?     'scalar' ( global float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 

Test/baseResults/hlsl.float4.frag.out

@@ -41,7 +41,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float AmbientColor,  uniform bool ff1, layout( offset=20) uniform float ff2, layout( binding=0 offset=32) uniform 4-component vector of float ff3, layout( binding=1 offset=48) uniform 4-component vector of float ff4})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 26
 

Test/baseResults/hlsl.forLoop.frag.out

@@ -401,7 +401,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'input' (layout( location=0) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 183
 

Test/baseResults/hlsl.fraggeom.frag.out

@@ -63,7 +63,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25
 

Test/baseResults/hlsl.gather.array.dx10.frag.out

@@ -259,7 +259,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 124
 

Test/baseResults/hlsl.gather.basic.dx10.frag.out

@@ -255,7 +255,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 135
 

Test/baseResults/hlsl.gather.basic.dx10.vert.out

@@ -219,7 +219,7 @@ Shader version: 500
 0:?     'g_tTexcdu4' ( uniform utextureCube)
 0:?     '@entryPointOutput.Pos' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 126
 

Test/baseResults/hlsl.gather.offset.dx10.frag.out

@@ -205,7 +205,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 114
 

Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out

@@ -199,7 +199,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 97
 

Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out

@@ -747,7 +747,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 255
 

Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out

@@ -755,7 +755,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Depth' ( out float FragDepth)
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 265