From 2b5ea9f8511d5c5ed1a59ac8a47d3d7171952dce Mon Sep 17 00:00:00 2001
From: John Kessenich <cepheus@frii.com>
Date: Wed, 31 Jan 2018 18:35:56 -0700
Subject: [PATCH] SPV Version: Emit the requested SPIR-V version, not the
 header version.

Fixes #1236.
---
 SPIRV/GlslangToSpv.cpp                                   | 9 +++++----
 SPIRV/SpvBuilder.cpp                                     | 5 +++--
 SPIRV/SpvBuilder.h                                       | 3 ++-
 StandAlone/StandAlone.cpp                                | 2 +-
 Test/baseLegalResults/hlsl.aliasOpaque.frag.out          | 2 +-
 Test/baseLegalResults/hlsl.flattenOpaque.frag.out        | 2 +-
 Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out    | 2 +-
 Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out | 2 +-
 Test/baseLegalResults/hlsl.flattenSubset.frag.out        | 2 +-
 Test/baseLegalResults/hlsl.flattenSubset2.frag.out       | 2 +-
 Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out  | 2 +-
 Test/baseLegalResults/hlsl.partialFlattenMixed.vert.out  | 2 +-
 Test/baseResults/glsl.entryPointRename.vert.bad.out      | 2 +-
 Test/baseResults/glsl.entryPointRename.vert.out          | 2 +-
 Test/baseResults/glspv.version.frag.out                  | 2 +-
 Test/baseResults/hlsl.PointSize.geom.out                 | 2 +-
 Test/baseResults/hlsl.PointSize.vert.out                 | 2 +-
 Test/baseResults/hlsl.aliasOpaque.frag.out               | 2 +-
 Test/baseResults/hlsl.amend.frag.out                     | 2 +-
 Test/baseResults/hlsl.array.flatten.frag.out             | 2 +-
 Test/baseResults/hlsl.array.frag.out                     | 2 +-
 Test/baseResults/hlsl.array.implicit-size.frag.out       | 2 +-
 Test/baseResults/hlsl.array.multidim.frag.out            | 2 +-
 Test/baseResults/hlsl.assoc.frag.out                     | 2 +-
 Test/baseResults/hlsl.attribute.expression.comp.out      | 2 +-
 Test/baseResults/hlsl.attribute.frag.out                 | 2 +-
 Test/baseResults/hlsl.attributeC11.frag.out              | 2 +-
 Test/baseResults/hlsl.attributeGlobalBuffer.frag.out     | 2 +-
 Test/baseResults/hlsl.basic.comp.out                     | 2 +-
 Test/baseResults/hlsl.basic.geom.out                     | 2 +-
 Test/baseResults/hlsl.boolConv.vert.out                  | 2 +-
 Test/baseResults/hlsl.buffer.frag.out                    | 2 +-
 Test/baseResults/hlsl.calculatelod.dx10.frag.out         | 2 +-
 Test/baseResults/hlsl.cast.frag.out                      | 2 +-
 Test/baseResults/hlsl.cbuffer-identifier.vert.out        | 2 +-
 Test/baseResults/hlsl.charLit.vert.out                   | 2 +-
 Test/baseResults/hlsl.clip.frag.out                      | 2 +-
 Test/baseResults/hlsl.clipdistance-1.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-1.geom.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-1.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-2.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-2.geom.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-2.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-3.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-3.geom.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-3.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-4.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-4.geom.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-4.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-5.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-5.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-6.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-6.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-7.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-7.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-8.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-8.vert.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-9.frag.out            | 2 +-
 Test/baseResults/hlsl.clipdistance-9.vert.out            | 2 +-
 Test/baseResults/hlsl.color.hull.tesc.out                | 2 +-
 Test/baseResults/hlsl.comparison.vec.frag.out            | 2 +-
 Test/baseResults/hlsl.conditional.frag.out               | 2 +-
 Test/baseResults/hlsl.constantbuffer.frag.out            | 2 +-
 Test/baseResults/hlsl.constructArray.vert.out            | 2 +-
 Test/baseResults/hlsl.constructexpr.frag.out             | 2 +-
 Test/baseResults/hlsl.constructimat.frag.out             | 2 +-
 Test/baseResults/hlsl.dashI.vert.out                     | 2 +-
 Test/baseResults/hlsl.deadFunctionMissingBody.vert.out   | 2 +-
 Test/baseResults/hlsl.depthGreater.frag.out              | 2 +-
 Test/baseResults/hlsl.depthLess.frag.out                 | 2 +-
 Test/baseResults/hlsl.discard.frag.out                   | 2 +-
 Test/baseResults/hlsl.doLoop.frag.out                    | 2 +-
 Test/baseResults/hlsl.domain.1.tese.out                  | 2 +-
 Test/baseResults/hlsl.domain.2.tese.out                  | 2 +-
 Test/baseResults/hlsl.domain.3.tese.out                  | 2 +-
 Test/baseResults/hlsl.emptystruct.init.vert.out          | 2 +-
 Test/baseResults/hlsl.emptystructreturn.frag.out         | 2 +-
 Test/baseResults/hlsl.emptystructreturn.vert.out         | 2 +-
 Test/baseResults/hlsl.entry-in.frag.out                  | 2 +-
 Test/baseResults/hlsl.entry-out.frag.out                 | 2 +-
 Test/baseResults/hlsl.entry.rename.frag.out              | 2 +-
 Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out   | 2 +-
 Test/baseResults/hlsl.explicitDescriptorSet.frag.out     | 2 +-
 Test/baseResults/hlsl.flatten.return.frag.out            | 2 +-
 Test/baseResults/hlsl.flattenOpaque.frag.out             | 2 +-
 Test/baseResults/hlsl.flattenOpaqueInit.vert.out         | 2 +-
 Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out      | 2 +-
 Test/baseResults/hlsl.flattenSubset.frag.out             | 2 +-
 Test/baseResults/hlsl.flattenSubset2.frag.out            | 2 +-
 Test/baseResults/hlsl.float1.frag.out                    | 2 +-
 Test/baseResults/hlsl.float4.frag.out                    | 2 +-
 Test/baseResults/hlsl.forLoop.frag.out                   | 2 +-
 Test/baseResults/hlsl.fraggeom.frag.out                  | 2 +-
 Test/baseResults/hlsl.gather.array.dx10.frag.out         | 2 +-
 Test/baseResults/hlsl.gather.basic.dx10.frag.out         | 2 +-
 Test/baseResults/hlsl.gather.basic.dx10.vert.out         | 2 +-
 Test/baseResults/hlsl.gather.offset.dx10.frag.out        | 2 +-
 Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out   | 2 +-
 Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out    | 2 +-
 .../hlsl.gatherRGBA.offsetarray.dx10.frag.out            | 2 +-
 Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out | 2 +-
 Test/baseResults/hlsl.getdimensions.dx10.frag.out        | 2 +-
 Test/baseResults/hlsl.getdimensions.dx10.vert.out        | 2 +-
 Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.getsampleposition.dx10.frag.out    | 2 +-
 Test/baseResults/hlsl.global-const-init.frag.out         | 2 +-
 Test/baseResults/hlsl.gs-hs-mix.tesc.out                 | 2 +-
 Test/baseResults/hlsl.hlslOffset.vert.out                | 2 +-
 Test/baseResults/hlsl.hull.1.tesc.out                    | 2 +-
 Test/baseResults/hlsl.hull.2.tesc.out                    | 2 +-
 Test/baseResults/hlsl.hull.3.tesc.out                    | 2 +-
 Test/baseResults/hlsl.hull.4.tesc.out                    | 2 +-
 Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out             | 2 +-
 Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out             | 2 +-
 Test/baseResults/hlsl.hull.void.tesc.out                 | 2 +-
 Test/baseResults/hlsl.identifier.sample.frag.out         | 2 +-
 Test/baseResults/hlsl.if.frag.out                        | 2 +-
 Test/baseResults/hlsl.implicitBool.frag.out              | 2 +-
 Test/baseResults/hlsl.include.vert.out                   | 2 +-
 Test/baseResults/hlsl.inf.vert.out                       | 2 +-
 Test/baseResults/hlsl.init.frag.out                      | 2 +-
 Test/baseResults/hlsl.init2.frag.out                     | 2 +-
 Test/baseResults/hlsl.inoutquals.frag.out                | 2 +-
 Test/baseResults/hlsl.intrinsic.frexp.frag.out           | 2 +-
 Test/baseResults/hlsl.intrinsic.frexp.vert.out           | 2 +-
 Test/baseResults/hlsl.intrinsics.barriers.comp.out       | 2 +-
 Test/baseResults/hlsl.intrinsics.comp.out                | 2 +-
 .../hlsl.intrinsics.d3dcolortoubyte4.frag.out            | 2 +-
 Test/baseResults/hlsl.intrinsics.double.frag.out         | 2 +-
 Test/baseResults/hlsl.intrinsics.evalfns.frag.out        | 2 +-
 Test/baseResults/hlsl.intrinsics.f1632.frag.out          | 2 +-
 Test/baseResults/hlsl.intrinsics.f3216.frag.out          | 2 +-
 Test/baseResults/hlsl.intrinsics.frag.out                | 2 +-
 Test/baseResults/hlsl.intrinsics.lit.frag.out            | 2 +-
 Test/baseResults/hlsl.intrinsics.negative.comp.out       | 2 +-
 Test/baseResults/hlsl.intrinsics.negative.vert.out       | 2 +-
 Test/baseResults/hlsl.intrinsics.promote.down.frag.out   | 2 +-
 Test/baseResults/hlsl.intrinsics.promote.frag.out        | 2 +-
 .../baseResults/hlsl.intrinsics.promote.outputs.frag.out | 2 +-
 Test/baseResults/hlsl.intrinsics.vert.out                | 2 +-
 Test/baseResults/hlsl.isfinite.frag.out                  | 2 +-
 Test/baseResults/hlsl.layout.frag.out                    | 2 +-
 Test/baseResults/hlsl.layoutOverride.vert.out            | 2 +-
 Test/baseResults/hlsl.load.2dms.dx10.frag.out            | 2 +-
 Test/baseResults/hlsl.load.array.dx10.frag.out           | 2 +-
 Test/baseResults/hlsl.load.basic.dx10.frag.out           | 2 +-
 Test/baseResults/hlsl.load.basic.dx10.vert.out           | 2 +-
 Test/baseResults/hlsl.load.buffer.dx10.frag.out          | 2 +-
 Test/baseResults/hlsl.load.buffer.float.dx10.frag.out    | 2 +-
 Test/baseResults/hlsl.load.offset.dx10.frag.out          | 2 +-
 Test/baseResults/hlsl.load.offsetarray.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out        | 2 +-
 Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out | 2 +-
 Test/baseResults/hlsl.load.rwtexture.dx10.frag.out       | 2 +-
 Test/baseResults/hlsl.logical.binary.frag.out            | 2 +-
 Test/baseResults/hlsl.logical.binary.vec.frag.out        | 2 +-
 Test/baseResults/hlsl.logical.unary.frag.out             | 2 +-
 Test/baseResults/hlsl.logicalConvert.frag.out            | 2 +-
 Test/baseResults/hlsl.loopattr.frag.out                  | 2 +-
 Test/baseResults/hlsl.matNx1.frag.out                    | 2 +-
 Test/baseResults/hlsl.matType.bool.frag.out              | 2 +-
 Test/baseResults/hlsl.matType.frag.out                   | 2 +-
 Test/baseResults/hlsl.matType.int.frag.out               | 2 +-
 Test/baseResults/hlsl.matpack-1.frag.out                 | 2 +-
 Test/baseResults/hlsl.matpack-pragma.frag.out            | 2 +-
 Test/baseResults/hlsl.matrixSwizzle.vert.out             | 2 +-
 Test/baseResults/hlsl.matrixindex.frag.out               | 2 +-
 Test/baseResults/hlsl.max.frag.out                       | 2 +-
 Test/baseResults/hlsl.memberFunCall.frag.out             | 2 +-
 Test/baseResults/hlsl.mintypes.frag.out                  | 2 +-
 Test/baseResults/hlsl.mip.operator.frag.out              | 2 +-
 Test/baseResults/hlsl.mul-truncate.frag.out              | 2 +-
 Test/baseResults/hlsl.multiDescriptorSet.frag.out        | 2 +-
 Test/baseResults/hlsl.multiEntry.vert.out                | 2 +-
 Test/baseResults/hlsl.multiReturn.frag.out               | 2 +-
 Test/baseResults/hlsl.namespace.frag.out                 | 2 +-
 Test/baseResults/hlsl.nonint-index.frag.out              | 2 +-
 Test/baseResults/hlsl.nonstaticMemberFunction.frag.out   | 2 +-
 Test/baseResults/hlsl.numericsuffixes.frag.out           | 2 +-
 Test/baseResults/hlsl.numthreads.comp.out                | 2 +-
 Test/baseResults/hlsl.opaque-type-bug.frag.out           | 2 +-
 Test/baseResults/hlsl.overload.frag.out                  | 2 +-
 Test/baseResults/hlsl.params.default.frag.out            | 2 +-
 Test/baseResults/hlsl.partialFlattenLocal.vert.out       | 2 +-
 Test/baseResults/hlsl.partialFlattenMixed.vert.out       | 2 +-
 Test/baseResults/hlsl.partialInit.frag.out               | 2 +-
 Test/baseResults/hlsl.pp.line.frag.out                   | 2 +-
 Test/baseResults/hlsl.pp.vert.out                        | 2 +-
 Test/baseResults/hlsl.precedence.frag.out                | 2 +-
 Test/baseResults/hlsl.precedence2.frag.out               | 2 +-
 Test/baseResults/hlsl.precise.frag.out                   | 2 +-
 Test/baseResults/hlsl.preprocessor.frag.out              | 2 +-
 Test/baseResults/hlsl.promote.atomic.frag.out            | 2 +-
 Test/baseResults/hlsl.promote.binary.frag.out            | 2 +-
 Test/baseResults/hlsl.promote.vec1.frag.out              | 2 +-
 Test/baseResults/hlsl.promotions.frag.out                | 2 +-
 Test/baseResults/hlsl.rw.atomics.frag.out                | 2 +-
 Test/baseResults/hlsl.rw.bracket.frag.out                | 2 +-
 Test/baseResults/hlsl.rw.register.frag.out               | 2 +-
 Test/baseResults/hlsl.rw.scalar.bracket.frag.out         | 2 +-
 Test/baseResults/hlsl.rw.swizzle.frag.out                | 2 +-
 Test/baseResults/hlsl.rw.vec2.bracket.frag.out           | 2 +-
 Test/baseResults/hlsl.sample.array.dx10.frag.out         | 2 +-
 Test/baseResults/hlsl.sample.basic.dx10.frag.out         | 2 +-
 Test/baseResults/hlsl.sample.offset.dx10.frag.out        | 2 +-
 Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out   | 2 +-
 Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out      | 2 +-
 Test/baseResults/hlsl.samplebias.array.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.samplebias.basic.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.samplebias.offset.dx10.frag.out    | 2 +-
 .../hlsl.samplebias.offsetarray.dx10.frag.out            | 2 +-
 Test/baseResults/hlsl.samplecmp.array.dx10.frag.out      | 2 +-
 Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out      | 2 +-
 Test/baseResults/hlsl.samplecmp.dualmode.frag.out        | 2 +-
 Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out     | 2 +-
 .../baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out | 2 +-
 .../hlsl.samplecmplevelzero.array.dx10.frag.out          | 2 +-
 .../hlsl.samplecmplevelzero.basic.dx10.frag.out          | 2 +-
 .../hlsl.samplecmplevelzero.offset.dx10.frag.out         | 2 +-
 .../hlsl.samplecmplevelzero.offsetarray.dx10.frag.out    | 2 +-
 Test/baseResults/hlsl.samplegrad.array.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out     | 2 +-
 Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out     | 2 +-
 Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out    | 2 +-
 .../hlsl.samplegrad.offsetarray.dx10.frag.out            | 2 +-
 Test/baseResults/hlsl.samplelevel.array.dx10.frag.out    | 2 +-
 Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out    | 2 +-
 Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out    | 2 +-
 Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out   | 2 +-
 .../hlsl.samplelevel.offsetarray.dx10.frag.out           | 2 +-
 Test/baseResults/hlsl.scalar-length.frag.out             | 2 +-
 Test/baseResults/hlsl.scalar2matrix.frag.out             | 2 +-
 Test/baseResults/hlsl.scalarCast.vert.out                | 2 +-
 Test/baseResults/hlsl.scope.frag.out                     | 2 +-
 Test/baseResults/hlsl.semantic-1.vert.out                | 2 +-
 Test/baseResults/hlsl.semantic.geom.out                  | 2 +-
 Test/baseResults/hlsl.semantic.vert.out                  | 2 +-
 Test/baseResults/hlsl.semicolons.frag.out                | 2 +-
 Test/baseResults/hlsl.shapeConv.frag.out                 | 2 +-
 Test/baseResults/hlsl.shapeConvRet.frag.out              | 2 +-
 Test/baseResults/hlsl.sin.frag.out                       | 2 +-
 Test/baseResults/hlsl.snorm.uav.comp.out                 | 2 +-
 Test/baseResults/hlsl.staticMemberFunction.frag.out      | 2 +-
 .../hlsl.store.rwbyteaddressbuffer.type.comp.out         | 2 +-
 Test/baseResults/hlsl.string.frag.out                    | 2 +-
 Test/baseResults/hlsl.stringtoken.frag.out               | 2 +-
 Test/baseResults/hlsl.struct.frag.out                    | 2 +-
 Test/baseResults/hlsl.struct.split-1.vert.out            | 2 +-
 Test/baseResults/hlsl.struct.split.array.geom.out        | 2 +-
 Test/baseResults/hlsl.struct.split.assign.frag.out       | 2 +-
 Test/baseResults/hlsl.struct.split.call.vert.out         | 2 +-
 Test/baseResults/hlsl.struct.split.nested.geom.out       | 2 +-
 Test/baseResults/hlsl.struct.split.trivial.geom.out      | 2 +-
 Test/baseResults/hlsl.struct.split.trivial.vert.out      | 2 +-
 Test/baseResults/hlsl.structIoFourWay.frag.out           | 2 +-
 Test/baseResults/hlsl.structStructName.frag.out          | 2 +-
 Test/baseResults/hlsl.structarray.flatten.frag.out       | 2 +-
 Test/baseResults/hlsl.structarray.flatten.geom.out       | 2 +-
 Test/baseResults/hlsl.structbuffer.append.fn.frag.out    | 2 +-
 Test/baseResults/hlsl.structbuffer.append.frag.out       | 2 +-
 Test/baseResults/hlsl.structbuffer.atomics.frag.out      | 2 +-
 Test/baseResults/hlsl.structbuffer.byte.frag.out         | 2 +-
 Test/baseResults/hlsl.structbuffer.coherent.frag.out     | 2 +-
 Test/baseResults/hlsl.structbuffer.floatidx.comp.out     | 2 +-
 Test/baseResults/hlsl.structbuffer.fn.frag.out           | 2 +-
 Test/baseResults/hlsl.structbuffer.fn2.comp.out          | 2 +-
 Test/baseResults/hlsl.structbuffer.frag.out              | 2 +-
 Test/baseResults/hlsl.structbuffer.incdec.frag.out       | 2 +-
 Test/baseResults/hlsl.structbuffer.rw.frag.out           | 2 +-
 Test/baseResults/hlsl.structbuffer.rwbyte.frag.out       | 2 +-
 Test/baseResults/hlsl.structin.vert.out                  | 2 +-
 Test/baseResults/hlsl.subpass.frag.out                   | 2 +-
 Test/baseResults/hlsl.switch.frag.out                    | 2 +-
 Test/baseResults/hlsl.swizzle.frag.out                   | 2 +-
 Test/baseResults/hlsl.synthesizeInput.frag.out           | 2 +-
 Test/baseResults/hlsl.target.frag.out                    | 2 +-
 Test/baseResults/hlsl.targetStruct1.frag.out             | 2 +-
 Test/baseResults/hlsl.targetStruct2.frag.out             | 2 +-
 Test/baseResults/hlsl.templatetypes.frag.out             | 2 +-
 Test/baseResults/hlsl.texture.struct.frag.out            | 2 +-
 Test/baseResults/hlsl.texture.subvec4.frag.out           | 2 +-
 Test/baseResults/hlsl.texturebuffer.frag.out             | 2 +-
 Test/baseResults/hlsl.this.frag.out                      | 2 +-
 Test/baseResults/hlsl.tx.bracket.frag.out                | 2 +-
 Test/baseResults/hlsl.tx.overload.frag.out               | 2 +-
 Test/baseResults/hlsl.type.half.frag.out                 | 2 +-
 Test/baseResults/hlsl.type.identifier.frag.out           | 2 +-
 Test/baseResults/hlsl.typeGraphCopy.vert.out             | 2 +-
 Test/baseResults/hlsl.typedef.frag.out                   | 2 +-
 Test/baseResults/hlsl.void.frag.out                      | 2 +-
 Test/baseResults/hlsl.whileLoop.frag.out                 | 2 +-
 Test/baseResults/hlsl.y-negate-1.vert.out                | 2 +-
 Test/baseResults/hlsl.y-negate-2.vert.out                | 2 +-
 Test/baseResults/hlsl.y-negate-3.vert.out                | 2 +-
 Test/baseResults/remap.basic.dcefunc.frag.out            | 2 +-
 Test/baseResults/remap.basic.everything.frag.out         | 2 +-
 Test/baseResults/remap.basic.none.frag.out               | 2 +-
 Test/baseResults/remap.basic.strip.frag.out              | 2 +-
 .../remap.hlsl.sample.basic.everything.frag.out          | 2 +-
 Test/baseResults/remap.hlsl.sample.basic.none.frag.out   | 2 +-
 Test/baseResults/remap.hlsl.sample.basic.strip.frag.out  | 2 +-
 .../remap.hlsl.templatetypes.everything.frag.out         | 2 +-
 Test/baseResults/remap.hlsl.templatetypes.none.frag.out  | 2 +-
 Test/baseResults/remap.if.everything.frag.out            | 2 +-
 Test/baseResults/remap.if.none.frag.out                  | 2 +-
 Test/baseResults/remap.similar_1a.everything.frag.out    | 2 +-
 Test/baseResults/remap.similar_1a.none.frag.out          | 2 +-
 Test/baseResults/remap.similar_1b.everything.frag.out    | 2 +-
 Test/baseResults/remap.similar_1b.none.frag.out          | 2 +-
 Test/baseResults/remap.specconst.comp.out                | 2 +-
 Test/baseResults/remap.switch.everything.frag.out        | 2 +-
 Test/baseResults/remap.switch.none.frag.out              | 2 +-
 Test/baseResults/remap.uniformarray.everything.frag.out  | 2 +-
 Test/baseResults/remap.uniformarray.none.frag.out        | 2 +-
 Test/baseResults/spv.100ops.frag.out                     | 2 +-
 Test/baseResults/spv.130.frag.out                        | 2 +-
 Test/baseResults/spv.140.frag.out                        | 2 +-
 Test/baseResults/spv.150.geom.out                        | 2 +-
 Test/baseResults/spv.150.vert.out                        | 2 +-
 Test/baseResults/spv.300BuiltIns.vert.out                | 2 +-
 Test/baseResults/spv.300layout.frag.out                  | 2 +-
 Test/baseResults/spv.300layout.vert.out                  | 2 +-
 Test/baseResults/spv.300layoutp.vert.out                 | 2 +-
 Test/baseResults/spv.310.bitcast.frag.out                | 2 +-
 Test/baseResults/spv.310.comp.out                        | 2 +-
 Test/baseResults/spv.330.geom.out                        | 2 +-
 Test/baseResults/spv.400.frag.out                        | 2 +-
 Test/baseResults/spv.400.tesc.out                        | 2 +-
 Test/baseResults/spv.400.tese.out                        | 2 +-
 Test/baseResults/spv.420.geom.out                        | 2 +-
 Test/baseResults/spv.430.frag.out                        | 2 +-
 Test/baseResults/spv.430.vert.out                        | 2 +-
 Test/baseResults/spv.450.geom.out                        | 2 +-
 Test/baseResults/spv.450.noRedecl.tesc.out               | 2 +-
 Test/baseResults/spv.450.tesc.out                        | 2 +-
 Test/baseResults/spv.460.comp.out                        | 2 +-
 Test/baseResults/spv.460.frag.out                        | 2 +-
 Test/baseResults/spv.460.vert.out                        | 2 +-
 Test/baseResults/spv.AofA.frag.out                       | 2 +-
 Test/baseResults/spv.GeometryShaderPassthrough.geom.out  | 2 +-
 Test/baseResults/spv.OVR_multiview.vert.out              | 2 +-
 Test/baseResults/spv.Operations.frag.out                 | 2 +-
 Test/baseResults/spv.accessChain.frag.out                | 2 +-
 Test/baseResults/spv.aggOps.frag.out                     | 2 +-
 Test/baseResults/spv.always-discard.frag.out             | 2 +-
 Test/baseResults/spv.always-discard2.frag.out            | 2 +-
 Test/baseResults/spv.arbPostDepthCoverage.frag.out       | 2 +-
 Test/baseResults/spv.atomic.comp.out                     | 2 +-
 Test/baseResults/spv.atomicInt64.comp.out                | 2 +-
 Test/baseResults/spv.barrier.vert.out                    | 2 +-
 Test/baseResults/spv.bitCast.frag.out                    | 2 +-
 Test/baseResults/spv.bool.vert.out                       | 2 +-
 Test/baseResults/spv.boolInBlock.frag.out                | 2 +-
 Test/baseResults/spv.branch-return.vert.out              | 2 +-
 Test/baseResults/spv.buffer.autoassign.frag.out          | 2 +-
 Test/baseResults/spv.builtInXFB.vert.out                 | 2 +-
 Test/baseResults/spv.conditionalDiscard.frag.out         | 2 +-
 Test/baseResults/spv.conversion.frag.out                 | 2 +-
 Test/baseResults/spv.dataOut.frag.out                    | 2 +-
 Test/baseResults/spv.dataOutIndirect.frag.out            | 2 +-
 Test/baseResults/spv.dataOutIndirect.vert.out            | 2 +-
 Test/baseResults/spv.debugInfo.frag.out                  | 2 +-
 Test/baseResults/spv.deepRvalue.frag.out                 | 2 +-
 Test/baseResults/spv.depthOut.frag.out                   | 2 +-
 Test/baseResults/spv.deviceGroup.frag.out                | 2 +-
 Test/baseResults/spv.discard-dce.frag.out                | 2 +-
 Test/baseResults/spv.do-simple.vert.out                  | 2 +-
 Test/baseResults/spv.do-while-continue-break.vert.out    | 2 +-
 Test/baseResults/spv.doWhileLoop.frag.out                | 2 +-
 Test/baseResults/spv.double.comp.out                     | 2 +-
 Test/baseResults/spv.drawParams.vert.out                 | 2 +-
 Test/baseResults/spv.earlyReturnDiscard.frag.out         | 2 +-
 Test/baseResults/spv.extPostDepthCoverage.frag.out       | 2 +-
 Test/baseResults/spv.float16.frag.out                    | 2 +-
 Test/baseResults/spv.flowControl.frag.out                | 2 +-
 Test/baseResults/spv.for-complex-condition.vert.out      | 2 +-
 Test/baseResults/spv.for-continue-break.vert.out         | 2 +-
 Test/baseResults/spv.for-nobody.vert.out                 | 2 +-
 Test/baseResults/spv.for-notest.vert.out                 | 2 +-
 Test/baseResults/spv.for-simple.vert.out                 | 2 +-
 Test/baseResults/spv.forLoop.frag.out                    | 2 +-
 Test/baseResults/spv.forwardFun.frag.out                 | 2 +-
 Test/baseResults/spv.fullyCovered.frag.out               | 2 +-
 Test/baseResults/spv.functionCall.frag.out               | 2 +-
 Test/baseResults/spv.functionNestedOpaque.vert.out       | 2 +-
 Test/baseResults/spv.functionSemantics.frag.out          | 2 +-
 Test/baseResults/spv.glFragColor.frag.out                | 2 +-
 Test/baseResults/spv.glsl.register.autoassign.frag.out   | 2 +-
 Test/baseResults/spv.glsl.register.noautoassign.frag.out | 2 +-
 Test/baseResults/spv.hlslDebugInfo.frag.out              | 2 +-
 Test/baseResults/spv.hlslOffsets.vert.out                | 2 +-
 Test/baseResults/spv.image.frag.out                      | 2 +-
 Test/baseResults/spv.imageLoadStoreLod.frag.out          | 2 +-
 Test/baseResults/spv.int16.frag.out                      | 2 +-
 Test/baseResults/spv.int64.frag.out                      | 2 +-
 Test/baseResults/spv.intOps.vert.out                     | 2 +-
 Test/baseResults/spv.interpOps.frag.out                  | 2 +-
 Test/baseResults/spv.layoutNested.vert.out               | 2 +-
 Test/baseResults/spv.length.frag.out                     | 2 +-
 Test/baseResults/spv.localAggregates.frag.out            | 2 +-
 Test/baseResults/spv.loops.frag.out                      | 2 +-
 Test/baseResults/spv.loopsArtificial.frag.out            | 2 +-
 Test/baseResults/spv.matFun.vert.out                     | 2 +-
 Test/baseResults/spv.matrix.frag.out                     | 2 +-
 Test/baseResults/spv.matrix2.frag.out                    | 2 +-
 Test/baseResults/spv.memoryQualifier.frag.out            | 2 +-
 Test/baseResults/spv.merge-unreachable.frag.out          | 2 +-
 Test/baseResults/spv.multiStruct.comp.out                | 2 +-
 Test/baseResults/spv.multiStructFuncall.frag.out         | 2 +-
 Test/baseResults/spv.multiView.frag.out                  | 2 +-
 Test/baseResults/spv.multiviewPerViewAttributes.tesc.out | 2 +-
 Test/baseResults/spv.multiviewPerViewAttributes.vert.out | 2 +-
 Test/baseResults/spv.newTexture.frag.out                 | 2 +-
 Test/baseResults/spv.noBuiltInLoc.vert.out               | 2 +-
 Test/baseResults/spv.noDeadDecorations.vert.out          | 2 +-
 Test/baseResults/spv.noWorkgroup.comp.out                | 2 +-
 Test/baseResults/spv.nonSquare.vert.out                  | 2 +-
 Test/baseResults/spv.offsets.frag.out                    | 2 +-
 Test/baseResults/spv.paramMemory.frag.out                | 2 +-
 Test/baseResults/spv.precise.tesc.out                    | 2 +-
 Test/baseResults/spv.precise.tese.out                    | 2 +-
 Test/baseResults/spv.precision.frag.out                  | 2 +-
 Test/baseResults/spv.precisionNonESSamp.frag.out         | 2 +-
 Test/baseResults/spv.prepost.frag.out                    | 2 +-
 Test/baseResults/spv.pushConstant.vert.out               | 2 +-
 Test/baseResults/spv.pushConstantAnon.vert.out           | 2 +-
 Test/baseResults/spv.qualifiers.vert.out                 | 2 +-
 Test/baseResults/spv.queryL.frag.out                     | 2 +-
 Test/baseResults/spv.register.autoassign-2.frag.out      | 2 +-
 Test/baseResults/spv.register.autoassign.frag.out        | 2 +-
 Test/baseResults/spv.register.noautoassign.frag.out      | 2 +-
 Test/baseResults/spv.register.subpass.frag.out           | 2 +-
 Test/baseResults/spv.rw.autoassign.frag.out              | 2 +-
 Test/baseResults/spv.sample.frag.out                     | 2 +-
 Test/baseResults/spv.sampleId.frag.out                   | 2 +-
 Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out | 2 +-
 Test/baseResults/spv.samplePosition.frag.out             | 2 +-
 Test/baseResults/spv.separate.frag.out                   | 2 +-
 Test/baseResults/spv.set.vert.out                        | 2 +-
 Test/baseResults/spv.shaderBallot.comp.out               | 2 +-
 Test/baseResults/spv.shaderBallotAMD.comp.out            | 2 +-
 Test/baseResults/spv.shaderDrawParams.vert.out           | 2 +-
 Test/baseResults/spv.shaderFragMaskAMD.frag.out          | 2 +-
 Test/baseResults/spv.shaderGroupVote.comp.out            | 2 +-
 Test/baseResults/spv.shaderStencilExport.frag.out        | 2 +-
 Test/baseResults/spv.shiftOps.frag.out                   | 2 +-
 Test/baseResults/spv.shortCircuit.frag.out               | 2 +-
 Test/baseResults/spv.simpleFunctionCall.frag.out         | 2 +-
 Test/baseResults/spv.simpleMat.vert.out                  | 2 +-
 Test/baseResults/spv.sparseTexture.frag.out              | 2 +-
 Test/baseResults/spv.sparseTextureClamp.frag.out         | 2 +-
 Test/baseResults/spv.specConst.vert.out                  | 2 +-
 Test/baseResults/spv.specConstant.comp.out               | 2 +-
 Test/baseResults/spv.specConstant.vert.out               | 2 +-
 Test/baseResults/spv.specConstantComposite.vert.out      | 2 +-
 Test/baseResults/spv.specConstantOperations.vert.out     | 2 +-
 Test/baseResults/spv.ssbo.autoassign.frag.out            | 2 +-
 Test/baseResults/spv.ssboAlias.frag.out                  | 2 +-
 Test/baseResults/spv.stereoViewRendering.tesc.out        | 2 +-
 Test/baseResults/spv.stereoViewRendering.vert.out        | 2 +-
 Test/baseResults/spv.storageBuffer.vert.out              | 2 +-
 Test/baseResults/spv.structAssignment.frag.out           | 2 +-
 Test/baseResults/spv.structDeref.frag.out                | 2 +-
 Test/baseResults/spv.structure.frag.out                  | 2 +-
 Test/baseResults/spv.subpass.frag.out                    | 2 +-
 Test/baseResults/spv.switch.frag.out                     | 2 +-
 Test/baseResults/spv.swizzle.frag.out                    | 2 +-
 Test/baseResults/spv.swizzleInversion.frag.out           | 2 +-
 Test/baseResults/spv.test.frag.out                       | 2 +-
 Test/baseResults/spv.test.vert.out                       | 2 +-
 Test/baseResults/spv.texture.frag.out                    | 2 +-
 Test/baseResults/spv.texture.sampler.transform.frag.out  | 2 +-
 Test/baseResults/spv.texture.vert.out                    | 2 +-
 Test/baseResults/spv.textureBuffer.vert.out              | 2 +-
 Test/baseResults/spv.textureGatherBiasLod.frag.out       | 2 +-
 Test/baseResults/spv.types.frag.out                      | 2 +-
 Test/baseResults/spv.uint.frag.out                       | 2 +-
 Test/baseResults/spv.uniformArray.frag.out               | 2 +-
 Test/baseResults/spv.variableArrayIndex.frag.out         | 2 +-
 Test/baseResults/spv.varyingArray.frag.out               | 2 +-
 Test/baseResults/spv.varyingArrayIndirect.frag.out       | 2 +-
 Test/baseResults/spv.viewportArray2.tesc.out             | 2 +-
 Test/baseResults/spv.viewportArray2.vert.out             | 2 +-
 Test/baseResults/spv.voidFunction.frag.out               | 2 +-
 Test/baseResults/spv.while-continue-break.vert.out       | 2 +-
 Test/baseResults/spv.while-simple.vert.out               | 2 +-
 Test/baseResults/spv.whileLoop.frag.out                  | 2 +-
 Test/baseResults/spv.xfb.vert.out                        | 2 +-
 Test/baseResults/spv.xfb2.vert.out                       | 2 +-
 Test/baseResults/spv.xfb3.vert.out                       | 2 +-
 Test/baseResults/vulkan.ast.vert.out                     | 2 +-
 493 files changed, 500 insertions(+), 497 deletions(-)

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index ce5e3696e..64bce356f 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/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);
diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp
index a6df392d9..408634e42 100644
--- a/SPIRV/SpvBuilder.cpp
+++ b/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);
diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h
index 59b1da2ee..1d8fd8be6 100755
--- a/SPIRV/SpvBuilder.h
+++ b/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;
diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 964c44e3a..69cea888f 100644
--- a/StandAlone/StandAlone.cpp
+++ b/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
diff --git a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out b/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
index 71367e47d..3bf38eaf3 100644
--- a/Test/baseLegalResults/hlsl.aliasOpaque.frag.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out b/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
index 1ebee7c3b..4b6874503 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaque.frag.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
index 1881f45db..1ca88ad52 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInit.vert.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
index 9bbbbf5d3..ee8126c6f 100644
--- a/Test/baseLegalResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.flattenSubset.frag.out b/Test/baseLegalResults/hlsl.flattenSubset.frag.out
index 2c1790bcc..c18a9e9e6 100755
--- a/Test/baseLegalResults/hlsl.flattenSubset.frag.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.flattenSubset2.frag.out b/Test/baseLegalResults/hlsl.flattenSubset2.frag.out
index aed1b61f2..e4f434293 100755
--- a/Test/baseLegalResults/hlsl.flattenSubset2.frag.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out b/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out
index e0ae5c6d0..06d125d1d 100755
--- a/Test/baseLegalResults/hlsl.partialFlattenLocal.vert.out
+++ b/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
 
diff --git a/Test/baseLegalResults/hlsl.partialFlattenMixed.vert.out b/Test/baseLegalResults/hlsl.partialFlattenMixed.vert.out
index a0502c6e0..ce9ec885e 100755
--- a/Test/baseLegalResults/hlsl.partialFlattenMixed.vert.out
+++ b/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
 
diff --git a/Test/baseResults/glsl.entryPointRename.vert.bad.out b/Test/baseResults/glsl.entryPointRename.vert.bad.out
index 942d312ac..2afceb874 100644
--- a/Test/baseResults/glsl.entryPointRename.vert.bad.out
+++ b/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
 
diff --git a/Test/baseResults/glsl.entryPointRename.vert.out b/Test/baseResults/glsl.entryPointRename.vert.out
index 92c09b974..0b17164bf 100644
--- a/Test/baseResults/glsl.entryPointRename.vert.out
+++ b/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
 
diff --git a/Test/baseResults/glspv.version.frag.out b/Test/baseResults/glspv.version.frag.out
index f8b20e68c..ba0d2b0d4 100755
--- a/Test/baseResults/glspv.version.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.PointSize.geom.out b/Test/baseResults/hlsl.PointSize.geom.out
index 444981652..532d17c88 100755
--- a/Test/baseResults/hlsl.PointSize.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.PointSize.vert.out b/Test/baseResults/hlsl.PointSize.vert.out
index ee9e9bf31..1a01bcbcf 100755
--- a/Test/baseResults/hlsl.PointSize.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.aliasOpaque.frag.out b/Test/baseResults/hlsl.aliasOpaque.frag.out
index cfaf466d4..cc0dd65d7 100755
--- a/Test/baseResults/hlsl.aliasOpaque.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.amend.frag.out b/Test/baseResults/hlsl.amend.frag.out
index 745e712e8..95d51ba38 100755
--- a/Test/baseResults/hlsl.amend.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.array.flatten.frag.out b/Test/baseResults/hlsl.array.flatten.frag.out
index 8e0e5e0d8..36e798044 100644
--- a/Test/baseResults/hlsl.array.flatten.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.array.frag.out b/Test/baseResults/hlsl.array.frag.out
index 2908d4676..ccf8c69ef 100755
--- a/Test/baseResults/hlsl.array.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.array.implicit-size.frag.out b/Test/baseResults/hlsl.array.implicit-size.frag.out
index 286b3e4c1..a81edc720 100644
--- a/Test/baseResults/hlsl.array.implicit-size.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.array.multidim.frag.out b/Test/baseResults/hlsl.array.multidim.frag.out
index 5694264a1..a82fe2d2a 100644
--- a/Test/baseResults/hlsl.array.multidim.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.assoc.frag.out b/Test/baseResults/hlsl.assoc.frag.out
index 18a0a31b5..b5b38f5cb 100755
--- a/Test/baseResults/hlsl.assoc.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.attribute.expression.comp.out b/Test/baseResults/hlsl.attribute.expression.comp.out
index df4fdd55c..53a8dcb1c 100644
--- a/Test/baseResults/hlsl.attribute.expression.comp.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.attribute.frag.out b/Test/baseResults/hlsl.attribute.frag.out
index efe3e7117..ce5203b3e 100755
--- a/Test/baseResults/hlsl.attribute.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.attributeC11.frag.out b/Test/baseResults/hlsl.attributeC11.frag.out
index d1d7297ca..b507abac0 100755
--- a/Test/baseResults/hlsl.attributeC11.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out b/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out
index c72b7e1cb..15aa7772c 100755
--- a/Test/baseResults/hlsl.attributeGlobalBuffer.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.basic.comp.out b/Test/baseResults/hlsl.basic.comp.out
index 8abc3b4c9..610c2381a 100755
--- a/Test/baseResults/hlsl.basic.comp.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.basic.geom.out b/Test/baseResults/hlsl.basic.geom.out
index fb86b5bae..a2cf7f1f5 100644
--- a/Test/baseResults/hlsl.basic.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.boolConv.vert.out b/Test/baseResults/hlsl.boolConv.vert.out
index 5ce064f92..b40709942 100755
--- a/Test/baseResults/hlsl.boolConv.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.buffer.frag.out b/Test/baseResults/hlsl.buffer.frag.out
index c9969a706..40ad65a80 100755
--- a/Test/baseResults/hlsl.buffer.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.calculatelod.dx10.frag.out b/Test/baseResults/hlsl.calculatelod.dx10.frag.out
index 392a56a0e..a9a15d987 100644
--- a/Test/baseResults/hlsl.calculatelod.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.cast.frag.out b/Test/baseResults/hlsl.cast.frag.out
index 16e85f96f..b267ef9ee 100755
--- a/Test/baseResults/hlsl.cast.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.cbuffer-identifier.vert.out b/Test/baseResults/hlsl.cbuffer-identifier.vert.out
index 63fb8a892..0f2f748eb 100644
--- a/Test/baseResults/hlsl.cbuffer-identifier.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.charLit.vert.out b/Test/baseResults/hlsl.charLit.vert.out
index a6e50cd0c..d2a1fa422 100755
--- a/Test/baseResults/hlsl.charLit.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clip.frag.out b/Test/baseResults/hlsl.clip.frag.out
index 634945f67..405e5455b 100644
--- a/Test/baseResults/hlsl.clip.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-1.frag.out b/Test/baseResults/hlsl.clipdistance-1.frag.out
index 14ec95dcb..7bebb7b17 100644
--- a/Test/baseResults/hlsl.clipdistance-1.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-1.geom.out b/Test/baseResults/hlsl.clipdistance-1.geom.out
index 8215b3aef..fbdfc2c6e 100644
--- a/Test/baseResults/hlsl.clipdistance-1.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-1.vert.out b/Test/baseResults/hlsl.clipdistance-1.vert.out
index 26d001b29..95eca5e64 100644
--- a/Test/baseResults/hlsl.clipdistance-1.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-2.frag.out b/Test/baseResults/hlsl.clipdistance-2.frag.out
index c25242f4d..244e07810 100644
--- a/Test/baseResults/hlsl.clipdistance-2.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-2.geom.out b/Test/baseResults/hlsl.clipdistance-2.geom.out
index 463f6ca5b..95e14669c 100644
--- a/Test/baseResults/hlsl.clipdistance-2.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-2.vert.out b/Test/baseResults/hlsl.clipdistance-2.vert.out
index 430e57496..a863d7bbd 100644
--- a/Test/baseResults/hlsl.clipdistance-2.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-3.frag.out b/Test/baseResults/hlsl.clipdistance-3.frag.out
index 7d47dd21c..cd5e05b20 100644
--- a/Test/baseResults/hlsl.clipdistance-3.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-3.geom.out b/Test/baseResults/hlsl.clipdistance-3.geom.out
index 4358f9f40..04477dc7b 100644
--- a/Test/baseResults/hlsl.clipdistance-3.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-3.vert.out b/Test/baseResults/hlsl.clipdistance-3.vert.out
index e613acaf3..07eece032 100644
--- a/Test/baseResults/hlsl.clipdistance-3.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-4.frag.out b/Test/baseResults/hlsl.clipdistance-4.frag.out
index fafde7997..d3da56821 100644
--- a/Test/baseResults/hlsl.clipdistance-4.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-4.geom.out b/Test/baseResults/hlsl.clipdistance-4.geom.out
index 03e3e1695..172a5dcb7 100644
--- a/Test/baseResults/hlsl.clipdistance-4.geom.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-4.vert.out b/Test/baseResults/hlsl.clipdistance-4.vert.out
index e5b9c4750..a44943114 100644
--- a/Test/baseResults/hlsl.clipdistance-4.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-5.frag.out b/Test/baseResults/hlsl.clipdistance-5.frag.out
index e73152d78..3ad4e2d5e 100644
--- a/Test/baseResults/hlsl.clipdistance-5.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-5.vert.out b/Test/baseResults/hlsl.clipdistance-5.vert.out
index 3b9b8eb4d..adc0a893b 100644
--- a/Test/baseResults/hlsl.clipdistance-5.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-6.frag.out b/Test/baseResults/hlsl.clipdistance-6.frag.out
index 878ee857a..f4daf029e 100644
--- a/Test/baseResults/hlsl.clipdistance-6.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-6.vert.out b/Test/baseResults/hlsl.clipdistance-6.vert.out
index 5ba1b6e11..c9fd80a57 100644
--- a/Test/baseResults/hlsl.clipdistance-6.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-7.frag.out b/Test/baseResults/hlsl.clipdistance-7.frag.out
index b2665c79f..ba0047e54 100644
--- a/Test/baseResults/hlsl.clipdistance-7.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-7.vert.out b/Test/baseResults/hlsl.clipdistance-7.vert.out
index ce20c5bca..d80c388d0 100644
--- a/Test/baseResults/hlsl.clipdistance-7.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-8.frag.out b/Test/baseResults/hlsl.clipdistance-8.frag.out
index b070386b6..254c5dbe1 100644
--- a/Test/baseResults/hlsl.clipdistance-8.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-8.vert.out b/Test/baseResults/hlsl.clipdistance-8.vert.out
index 73c46d2ed..a2a4dadbd 100644
--- a/Test/baseResults/hlsl.clipdistance-8.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-9.frag.out b/Test/baseResults/hlsl.clipdistance-9.frag.out
index d8a4abe8b..107b25596 100644
--- a/Test/baseResults/hlsl.clipdistance-9.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.clipdistance-9.vert.out b/Test/baseResults/hlsl.clipdistance-9.vert.out
index 3a3f9cc0a..73a5deb90 100644
--- a/Test/baseResults/hlsl.clipdistance-9.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.color.hull.tesc.out b/Test/baseResults/hlsl.color.hull.tesc.out
index bbcb19e2d..fc03748b8 100644
--- a/Test/baseResults/hlsl.color.hull.tesc.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.comparison.vec.frag.out b/Test/baseResults/hlsl.comparison.vec.frag.out
index 80bc467af..c6b4829b0 100644
--- a/Test/baseResults/hlsl.comparison.vec.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.conditional.frag.out b/Test/baseResults/hlsl.conditional.frag.out
index 31e3475d4..a68951d2f 100755
--- a/Test/baseResults/hlsl.conditional.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.constantbuffer.frag.out b/Test/baseResults/hlsl.constantbuffer.frag.out
index bedee9f48..f60fcf680 100644
--- a/Test/baseResults/hlsl.constantbuffer.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.constructArray.vert.out b/Test/baseResults/hlsl.constructArray.vert.out
index 17d8af996..759d4cc16 100755
--- a/Test/baseResults/hlsl.constructArray.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.constructexpr.frag.out b/Test/baseResults/hlsl.constructexpr.frag.out
index 54637ff65..e657b51e0 100644
--- a/Test/baseResults/hlsl.constructexpr.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.constructimat.frag.out b/Test/baseResults/hlsl.constructimat.frag.out
index 47d4bb903..460118be8 100644
--- a/Test/baseResults/hlsl.constructimat.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.dashI.vert.out b/Test/baseResults/hlsl.dashI.vert.out
index f66cd48ee..cad3d10ed 100644
--- a/Test/baseResults/hlsl.dashI.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out b/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out
index fe7319da0..f1f9cc638 100644
--- a/Test/baseResults/hlsl.deadFunctionMissingBody.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.depthGreater.frag.out b/Test/baseResults/hlsl.depthGreater.frag.out
index e55ee6cc6..fe398d5e8 100755
--- a/Test/baseResults/hlsl.depthGreater.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.depthLess.frag.out b/Test/baseResults/hlsl.depthLess.frag.out
index 299fac2f1..a22768f24 100755
--- a/Test/baseResults/hlsl.depthLess.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.discard.frag.out b/Test/baseResults/hlsl.discard.frag.out
index 81e69946a..f24b49627 100755
--- a/Test/baseResults/hlsl.discard.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.doLoop.frag.out b/Test/baseResults/hlsl.doLoop.frag.out
index da5c3e0c0..eb663ce5f 100755
--- a/Test/baseResults/hlsl.doLoop.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.domain.1.tese.out b/Test/baseResults/hlsl.domain.1.tese.out
index 3b7df5f13..ec8942282 100644
--- a/Test/baseResults/hlsl.domain.1.tese.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.domain.2.tese.out b/Test/baseResults/hlsl.domain.2.tese.out
index 0d7d7e8db..62960477e 100644
--- a/Test/baseResults/hlsl.domain.2.tese.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.domain.3.tese.out b/Test/baseResults/hlsl.domain.3.tese.out
index bcbd298dc..ca4e2d409 100644
--- a/Test/baseResults/hlsl.domain.3.tese.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.emptystruct.init.vert.out b/Test/baseResults/hlsl.emptystruct.init.vert.out
index 32f17d20b..9c43a9f44 100644
--- a/Test/baseResults/hlsl.emptystruct.init.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.emptystructreturn.frag.out b/Test/baseResults/hlsl.emptystructreturn.frag.out
index 45a5ceafb..4a61d1db5 100644
--- a/Test/baseResults/hlsl.emptystructreturn.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.emptystructreturn.vert.out b/Test/baseResults/hlsl.emptystructreturn.vert.out
index 0032ebdbf..c901c1940 100644
--- a/Test/baseResults/hlsl.emptystructreturn.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.entry-in.frag.out b/Test/baseResults/hlsl.entry-in.frag.out
index 91a33877b..063804da7 100755
--- a/Test/baseResults/hlsl.entry-in.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.entry-out.frag.out b/Test/baseResults/hlsl.entry-out.frag.out
index 11578b02c..7d7bb6f09 100755
--- a/Test/baseResults/hlsl.entry-out.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.entry.rename.frag.out b/Test/baseResults/hlsl.entry.rename.frag.out
index 989cac59f..9a555dd87 100644
--- a/Test/baseResults/hlsl.entry.rename.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out b/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out
index 82c6db4c6..2619e4e3e 100644
--- a/Test/baseResults/hlsl.explicitDescriptorSet-2.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.explicitDescriptorSet.frag.out b/Test/baseResults/hlsl.explicitDescriptorSet.frag.out
index 7d866ff00..4e5fc6773 100644
--- a/Test/baseResults/hlsl.explicitDescriptorSet.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flatten.return.frag.out b/Test/baseResults/hlsl.flatten.return.frag.out
index 8c338bb59..2ff5eeb89 100644
--- a/Test/baseResults/hlsl.flatten.return.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flattenOpaque.frag.out b/Test/baseResults/hlsl.flattenOpaque.frag.out
index 900999c4e..c6dc05496 100755
--- a/Test/baseResults/hlsl.flattenOpaque.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out b/Test/baseResults/hlsl.flattenOpaqueInit.vert.out
index 1a9b15552..33aee9004 100755
--- a/Test/baseResults/hlsl.flattenOpaqueInit.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out b/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out
index d50c6c79e..f867f2413 100755
--- a/Test/baseResults/hlsl.flattenOpaqueInitMix.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flattenSubset.frag.out b/Test/baseResults/hlsl.flattenSubset.frag.out
index 69f2eaca5..e5e182fb3 100755
--- a/Test/baseResults/hlsl.flattenSubset.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.flattenSubset2.frag.out b/Test/baseResults/hlsl.flattenSubset2.frag.out
index 4ee226cb3..c6c16e6c1 100755
--- a/Test/baseResults/hlsl.flattenSubset2.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.float1.frag.out b/Test/baseResults/hlsl.float1.frag.out
index 130717506..56e1aa933 100755
--- a/Test/baseResults/hlsl.float1.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.float4.frag.out b/Test/baseResults/hlsl.float4.frag.out
index 528b8d1d8..c457cd31a 100755
--- a/Test/baseResults/hlsl.float4.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.forLoop.frag.out b/Test/baseResults/hlsl.forLoop.frag.out
index e7321577d..77e78fe0a 100755
--- a/Test/baseResults/hlsl.forLoop.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.fraggeom.frag.out b/Test/baseResults/hlsl.fraggeom.frag.out
index 2dfb2fac8..6dd886256 100644
--- a/Test/baseResults/hlsl.fraggeom.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gather.array.dx10.frag.out b/Test/baseResults/hlsl.gather.array.dx10.frag.out
index b01c4712e..725f309bc 100644
--- a/Test/baseResults/hlsl.gather.array.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gather.basic.dx10.frag.out b/Test/baseResults/hlsl.gather.basic.dx10.frag.out
index 4acd7c149..bebaf9056 100644
--- a/Test/baseResults/hlsl.gather.basic.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gather.basic.dx10.vert.out b/Test/baseResults/hlsl.gather.basic.dx10.vert.out
index 6e3a896d6..34cf79442 100644
--- a/Test/baseResults/hlsl.gather.basic.dx10.vert.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gather.offset.dx10.frag.out b/Test/baseResults/hlsl.gather.offset.dx10.frag.out
index b13361df1..707377769 100644
--- a/Test/baseResults/hlsl.gather.offset.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
index 2a65867e8..599f68f98 100644
--- a/Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
index ad24db0f8..41e2ed42a 100644
--- a/Test/baseResults/hlsl.gatherRGBA.array.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
index f9e0d41fe..5de8d7af2 100644
--- a/Test/baseResults/hlsl.gatherRGBA.basic.dx10.frag.out
+++ b/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
 
diff --git a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
index 80c1408ea..21653f6c1 100644
--- a/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offset.dx10.frag.out
@@ -1259,7 +1259,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 399
 
diff --git a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
index 290f01803..3739787ab 100644
--- a/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.gatherRGBA.offsetarray.dx10.frag.out
@@ -1251,7 +1251,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 389
 
diff --git a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
index 4c3c66993..3351a9933 100644
--- a/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.gathercmpRGBA.offset.dx10.frag.out
@@ -453,7 +453,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 164
 
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
index 93cc6a3aa..7b5da68ac 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.frag.out
@@ -2315,7 +2315,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 550
 
diff --git a/Test/baseResults/hlsl.getdimensions.dx10.vert.out b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
index 61e44e153..e407bb049 100644
--- a/Test/baseResults/hlsl.getdimensions.dx10.vert.out
+++ b/Test/baseResults/hlsl.getdimensions.dx10.vert.out
@@ -115,7 +115,7 @@ Shader version: 500
 0:?     'g_tTex1df4' (layout( binding=0) uniform texture1D)
 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 48
 
diff --git a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
index 396fc5d94..6f24423fd 100644
--- a/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
+++ b/Test/baseResults/hlsl.getdimensions.rw.dx10.frag.out
@@ -715,7 +715,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 232
 
diff --git a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
index 8c3bff5d9..b5070e3d6 100644
--- a/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
+++ b/Test/baseResults/hlsl.getsampleposition.dx10.frag.out
@@ -577,7 +577,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput.Color' (layout( location=0) out 4-component vector of float)
 0:?     'sample' (layout( location=0) flat in int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 221
 
diff --git a/Test/baseResults/hlsl.global-const-init.frag.out b/Test/baseResults/hlsl.global-const-init.frag.out
index c9a525c27..3e99bfa81 100644
--- a/Test/baseResults/hlsl.global-const-init.frag.out
+++ b/Test/baseResults/hlsl.global-const-init.frag.out
@@ -101,7 +101,7 @@ gl_FragCoord origin is upper left
 0:?       8.000000
 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 50
 
diff --git a/Test/baseResults/hlsl.gs-hs-mix.tesc.out b/Test/baseResults/hlsl.gs-hs-mix.tesc.out
index 74822af74..c4694f9ee 100644
--- a/Test/baseResults/hlsl.gs-hs-mix.tesc.out
+++ b/Test/baseResults/hlsl.gs-hs-mix.tesc.out
@@ -797,7 +797,7 @@ triangle order = ccw
 0:?     '@patchConstantOutput.InsideTessFactor' ( patch out 2-element array of float TessLevelInner)
 0:?     '@patchConstantOutput' (layout( location=1) patch out structure{ temp 3-element array of 3-component vector of float NormalWS})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 216
 
diff --git a/Test/baseResults/hlsl.hlslOffset.vert.out b/Test/baseResults/hlsl.hlslOffset.vert.out
index 6a1369f77..8ccd10d64 100644
--- a/Test/baseResults/hlsl.hlslOffset.vert.out
+++ b/Test/baseResults/hlsl.hlslOffset.vert.out
@@ -25,7 +25,7 @@ Shader version: 500
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform float m0, layout( row_major std140) uniform 3-component vector of float m4, layout( row_major std140) uniform float m16, layout( row_major std140 offset=20) uniform 3-component vector of float m20, layout( row_major std140 offset=36) uniform 3-component vector of float m36, layout( row_major std140 offset=56) uniform 2-component vector of float m56, layout( row_major std140) uniform float m64, layout( row_major std140) uniform 2-component vector of float m68, layout( row_major std140) uniform float m76, layout( row_major std140) uniform float m80, layout( row_major std140) uniform 1-element array of 2-component vector of float m96})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 18
 
diff --git a/Test/baseResults/hlsl.hull.1.tesc.out b/Test/baseResults/hlsl.hull.1.tesc.out
index e8a8036f2..f17f50fe8 100644
--- a/Test/baseResults/hlsl.hull.1.tesc.out
+++ b/Test/baseResults/hlsl.hull.1.tesc.out
@@ -223,7 +223,7 @@ vertex spacing = equal_spacing
 0:?     'pid' ( in uint PrimitiveID)
 0:?     '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 89
 
diff --git a/Test/baseResults/hlsl.hull.2.tesc.out b/Test/baseResults/hlsl.hull.2.tesc.out
index 49ed33adc..1db386fb0 100644
--- a/Test/baseResults/hlsl.hull.2.tesc.out
+++ b/Test/baseResults/hlsl.hull.2.tesc.out
@@ -219,7 +219,7 @@ vertex spacing = equal_spacing
 0:?     'pos' ( in 4-component vector of float Position)
 0:?     '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 91
 
diff --git a/Test/baseResults/hlsl.hull.3.tesc.out b/Test/baseResults/hlsl.hull.3.tesc.out
index da72657ea..bbfb6a75a 100755
--- a/Test/baseResults/hlsl.hull.3.tesc.out
+++ b/Test/baseResults/hlsl.hull.3.tesc.out
@@ -219,7 +219,7 @@ vertex spacing = equal_spacing
 0:?     'pos' ( in 4-component vector of float Position)
 0:?     '@patchConstantOutput.edges' ( patch out 4-element array of float TessLevelOuter)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 91
 
diff --git a/Test/baseResults/hlsl.hull.4.tesc.out b/Test/baseResults/hlsl.hull.4.tesc.out
index 0aa39f360..dae5b49df 100644
--- a/Test/baseResults/hlsl.hull.4.tesc.out
+++ b/Test/baseResults/hlsl.hull.4.tesc.out
@@ -475,7 +475,7 @@ triangle order = cw
 0:?     '@patchConstantOutput.fTessFactor' ( patch out 4-element array of float TessLevelOuter)
 0:?     '@patchConstantOutput.fInsideTessFactor' ( 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
 
diff --git a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
index aa5eb4508..a9666fb5b 100644
--- a/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
+++ b/Test/baseResults/hlsl.hull.ctrlpt-1.tesc.out
@@ -395,7 +395,7 @@ triangle order = cw
 0:?     '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter)
 0:?     '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 124
 
diff --git a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
index 8c614c415..791edc45d 100644
--- a/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
+++ b/Test/baseResults/hlsl.hull.ctrlpt-2.tesc.out
@@ -413,7 +413,7 @@ triangle order = cw
 0:?     '@patchConstantOutput.tfactor' ( patch out 4-element array of float TessLevelOuter)
 0:?     '@patchConstantOutput.flInFactor' ( patch out 2-element array of float TessLevelInner)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 126
 
diff --git a/Test/baseResults/hlsl.hull.void.tesc.out b/Test/baseResults/hlsl.hull.void.tesc.out
index 30373465f..fa151946f 100644
--- a/Test/baseResults/hlsl.hull.void.tesc.out
+++ b/Test/baseResults/hlsl.hull.void.tesc.out
@@ -107,7 +107,7 @@ triangle order = ccw
 0:?     'ip' (layout( location=0) in 3-element array of structure{ temp 3-component vector of float cpoint})
 0:?     'InvocationId' ( in uint InvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 55
 
diff --git a/Test/baseResults/hlsl.identifier.sample.frag.out b/Test/baseResults/hlsl.identifier.sample.frag.out
index a05ec2ac6..9e1a50607 100644
--- a/Test/baseResults/hlsl.identifier.sample.frag.out
+++ b/Test/baseResults/hlsl.identifier.sample.frag.out
@@ -85,7 +85,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 33
 
diff --git a/Test/baseResults/hlsl.if.frag.out b/Test/baseResults/hlsl.if.frag.out
index fd666a4e8..32dcb30b9 100755
--- a/Test/baseResults/hlsl.if.frag.out
+++ b/Test/baseResults/hlsl.if.frag.out
@@ -215,7 +215,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 103
 
diff --git a/Test/baseResults/hlsl.implicitBool.frag.out b/Test/baseResults/hlsl.implicitBool.frag.out
index 7f0a2e715..66e041f35 100755
--- a/Test/baseResults/hlsl.implicitBool.frag.out
+++ b/Test/baseResults/hlsl.implicitBool.frag.out
@@ -333,7 +333,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform float condf,  uniform int condi,  uniform 1-component vector of float condf1,  uniform 1-component vector of int condi1})
 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 140
 
diff --git a/Test/baseResults/hlsl.include.vert.out b/Test/baseResults/hlsl.include.vert.out
index cd830af9b..4437bc1dd 100755
--- a/Test/baseResults/hlsl.include.vert.out
+++ b/Test/baseResults/hlsl.include.vert.out
@@ -1,5 +1,5 @@
 ../Test/hlsl.include.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 44
 
diff --git a/Test/baseResults/hlsl.inf.vert.out b/Test/baseResults/hlsl.inf.vert.out
index 989843089..8ee93eed2 100755
--- a/Test/baseResults/hlsl.inf.vert.out
+++ b/Test/baseResults/hlsl.inf.vert.out
@@ -111,7 +111,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 37
 
diff --git a/Test/baseResults/hlsl.init.frag.out b/Test/baseResults/hlsl.init.frag.out
index 38a6371c6..33122aba7 100755
--- a/Test/baseResults/hlsl.init.frag.out
+++ b/Test/baseResults/hlsl.init.frag.out
@@ -330,7 +330,7 @@ gl_FragCoord origin is upper left
 0:?     'input' (layout( location=0) in 4-component vector of float)
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform float a, layout( row_major std140) uniform float b, layout( row_major std140) uniform float c})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 110
 
diff --git a/Test/baseResults/hlsl.init2.frag.out b/Test/baseResults/hlsl.init2.frag.out
index 9b9f95e8c..d476e60ec 100644
--- a/Test/baseResults/hlsl.init2.frag.out
+++ b/Test/baseResults/hlsl.init2.frag.out
@@ -357,7 +357,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 112
 
diff --git a/Test/baseResults/hlsl.inoutquals.frag.out b/Test/baseResults/hlsl.inoutquals.frag.out
index 823943ab3..c5529b78d 100644
--- a/Test/baseResults/hlsl.inoutquals.frag.out
+++ b/Test/baseResults/hlsl.inoutquals.frag.out
@@ -205,7 +205,7 @@ gl_FragCoord origin is upper left
 0:?     'inpos' ( noperspective in 4-component vector of float FragCoord)
 0:?     'sampleMask' ( out int SampleMaskIn)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 88
 
diff --git a/Test/baseResults/hlsl.intrinsic.frexp.frag.out b/Test/baseResults/hlsl.intrinsic.frexp.frag.out
index cf901ec7a..400d60496 100644
--- a/Test/baseResults/hlsl.intrinsic.frexp.frag.out
+++ b/Test/baseResults/hlsl.intrinsic.frexp.frag.out
@@ -189,7 +189,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 98
 
diff --git a/Test/baseResults/hlsl.intrinsic.frexp.vert.out b/Test/baseResults/hlsl.intrinsic.frexp.vert.out
index 20d37e8ff..a8aa96bec 100644
--- a/Test/baseResults/hlsl.intrinsic.frexp.vert.out
+++ b/Test/baseResults/hlsl.intrinsic.frexp.vert.out
@@ -112,7 +112,7 @@ Shader version: 500
 0:?           4.000000
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 78
 
diff --git a/Test/baseResults/hlsl.intrinsics.barriers.comp.out b/Test/baseResults/hlsl.intrinsics.barriers.comp.out
index b2ec10f8a..0a9cb1403 100644
--- a/Test/baseResults/hlsl.intrinsics.barriers.comp.out
+++ b/Test/baseResults/hlsl.intrinsics.barriers.comp.out
@@ -51,7 +51,7 @@ local_size = (1, 1, 1)
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/hlsl.intrinsics.comp.out b/Test/baseResults/hlsl.intrinsics.comp.out
index b5b282ba5..0ccddd29b 100644
--- a/Test/baseResults/hlsl.intrinsics.comp.out
+++ b/Test/baseResults/hlsl.intrinsics.comp.out
@@ -715,7 +715,7 @@ local_size = (1, 1, 1)
 0:?     'inU0' (layout( location=3) in 4-component vector of uint)
 0:?     'inU1' (layout( location=4) in 4-component vector of uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 265
 
diff --git a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
index c469ab157..20ee22298 100644
--- a/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.d3dcolortoubyte4.frag.out
@@ -73,7 +73,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float col4})
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 29
 
diff --git a/Test/baseResults/hlsl.intrinsics.double.frag.out b/Test/baseResults/hlsl.intrinsics.double.frag.out
index 44d74f7e1..500d1e1fe 100644
--- a/Test/baseResults/hlsl.intrinsics.double.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.double.frag.out
@@ -163,7 +163,7 @@ gl_FragCoord origin is upper left
 0:?     'inU1a' (layout( location=8) flat in uint)
 0:?     'inU1b' (layout( location=9) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 90
 
diff --git a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out
index f1c2114f8..addaa25d5 100644
--- a/Test/baseResults/hlsl.intrinsics.evalfns.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.evalfns.frag.out
@@ -153,7 +153,7 @@ gl_FragCoord origin is upper left
 0:?     'inF4' (layout( location=3) in 4-component vector of float)
 0:?     'inI2' (layout( location=4) flat in 2-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 80
 
diff --git a/Test/baseResults/hlsl.intrinsics.f1632.frag.out b/Test/baseResults/hlsl.intrinsics.f1632.frag.out
index 3d187477b..72520bc47 100644
--- a/Test/baseResults/hlsl.intrinsics.f1632.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.f1632.frag.out
@@ -259,7 +259,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 103
 
diff --git a/Test/baseResults/hlsl.intrinsics.f3216.frag.out b/Test/baseResults/hlsl.intrinsics.f3216.frag.out
index fa07adac4..b6d65873d 100644
--- a/Test/baseResults/hlsl.intrinsics.f3216.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.f3216.frag.out
@@ -269,7 +269,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 106
 
diff --git a/Test/baseResults/hlsl.intrinsics.frag.out b/Test/baseResults/hlsl.intrinsics.frag.out
index 6b6c70555..bac6fabe1 100644
--- a/Test/baseResults/hlsl.intrinsics.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.frag.out
@@ -5631,7 +5631,7 @@ gl_FragCoord origin is upper left
 0:?     'gs_uc4' ( shared 4-component vector of uint)
 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 1832
 
diff --git a/Test/baseResults/hlsl.intrinsics.lit.frag.out b/Test/baseResults/hlsl.intrinsics.lit.frag.out
index d530fa530..c2c7e851d 100644
--- a/Test/baseResults/hlsl.intrinsics.lit.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.lit.frag.out
@@ -117,7 +117,7 @@ gl_FragCoord origin is upper left
 0:?     'n_dot_h' (layout( location=1) in float)
 0:?     'm' (layout( location=2) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 52
 
diff --git a/Test/baseResults/hlsl.intrinsics.negative.comp.out b/Test/baseResults/hlsl.intrinsics.negative.comp.out
index fc39c1ac0..a1a61d8bc 100644
--- a/Test/baseResults/hlsl.intrinsics.negative.comp.out
+++ b/Test/baseResults/hlsl.intrinsics.negative.comp.out
@@ -179,7 +179,7 @@ local_size = (1, 1, 1)
 0:?     'inF2' (layout( location=2) in 4-component vector of float)
 0:?     'inI0' (layout( location=3) in 4-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 99
 
diff --git a/Test/baseResults/hlsl.intrinsics.negative.vert.out b/Test/baseResults/hlsl.intrinsics.negative.vert.out
index dd9817306..f1dc1c338 100644
--- a/Test/baseResults/hlsl.intrinsics.negative.vert.out
+++ b/Test/baseResults/hlsl.intrinsics.negative.vert.out
@@ -307,7 +307,7 @@ Shader version: 500
 0:?     'inF2' (layout( location=2) in 4-component vector of float)
 0:?     'inI0' (layout( location=3) in 4-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 155
 
diff --git a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
index bff5bf5b5..a3748c328 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.down.frag.out
@@ -103,7 +103,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int i,  uniform uint u,  uniform float f,  uniform bool b,  uniform 2-component vector of int i2,  uniform 2-component vector of uint u2,  uniform 2-component vector of float f2,  uniform 2-component vector of bool b2})
 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 50
 
diff --git a/Test/baseResults/hlsl.intrinsics.promote.frag.out b/Test/baseResults/hlsl.intrinsics.promote.frag.out
index e6df40a28..e66da7ef1 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.frag.out
@@ -887,7 +887,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tTex1df4' ( uniform texture1D)
 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 322
 
diff --git a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
index 9bbb80041..ff3e0cf32 100644
--- a/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
+++ b/Test/baseResults/hlsl.intrinsics.promote.outputs.frag.out
@@ -203,7 +203,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tTex1df4' ( uniform texture1D)
 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 80
 
diff --git a/Test/baseResults/hlsl.intrinsics.vert.out b/Test/baseResults/hlsl.intrinsics.vert.out
index 82aa8b1db..eccf03d10 100644
--- a/Test/baseResults/hlsl.intrinsics.vert.out
+++ b/Test/baseResults/hlsl.intrinsics.vert.out
@@ -2778,7 +2778,7 @@ Shader version: 500
 0:413            'inFM3x2' ( in 3X2 matrix of float)
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 1225
 
diff --git a/Test/baseResults/hlsl.isfinite.frag.out b/Test/baseResults/hlsl.isfinite.frag.out
index 053634a9b..46593defd 100644
--- a/Test/baseResults/hlsl.isfinite.frag.out
+++ b/Test/baseResults/hlsl.isfinite.frag.out
@@ -171,7 +171,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform float f,  uniform 2-component vector of float f2,  uniform 3-component vector of float f3})
 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 85
 
diff --git a/Test/baseResults/hlsl.layout.frag.out b/Test/baseResults/hlsl.layout.frag.out
index 484d947b3..7ceb5e7fc 100755
--- a/Test/baseResults/hlsl.layout.frag.out
+++ b/Test/baseResults/hlsl.layout.frag.out
@@ -86,7 +86,7 @@ gl_FragCoord origin is upper left
 0:?       10 (const int)
 0:?     'anon@2' (layout( set=4 binding=7 row_major std430) readonly buffer block{layout( row_major std430 offset=16) buffer 4-component vector of float v1PostLayout})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 44
 
diff --git a/Test/baseResults/hlsl.layoutOverride.vert.out b/Test/baseResults/hlsl.layoutOverride.vert.out
index f6c634f10..e5cdcfe30 100755
--- a/Test/baseResults/hlsl.layoutOverride.vert.out
+++ b/Test/baseResults/hlsl.layoutOverride.vert.out
@@ -51,7 +51,7 @@ Shader version: 500
 0:?     'samp' ( uniform sampler)
 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 32
 
diff --git a/Test/baseResults/hlsl.load.2dms.dx10.frag.out b/Test/baseResults/hlsl.load.2dms.dx10.frag.out
index 3a6c93901..f7749a973 100644
--- a/Test/baseResults/hlsl.load.2dms.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.2dms.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 130
 
diff --git a/Test/baseResults/hlsl.load.array.dx10.frag.out b/Test/baseResults/hlsl.load.array.dx10.frag.out
index d15caa5aa..e4202423c 100644
--- a/Test/baseResults/hlsl.load.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.array.dx10.frag.out
@@ -385,7 +385,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 159
 
diff --git a/Test/baseResults/hlsl.load.basic.dx10.frag.out b/Test/baseResults/hlsl.load.basic.dx10.frag.out
index b56433250..4a7606246 100644
--- a/Test/baseResults/hlsl.load.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.basic.dx10.frag.out
@@ -487,7 +487,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 179
 
diff --git a/Test/baseResults/hlsl.load.basic.dx10.vert.out b/Test/baseResults/hlsl.load.basic.dx10.vert.out
index 4651fd959..a3beaf4d0 100644
--- a/Test/baseResults/hlsl.load.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.load.basic.dx10.vert.out
@@ -451,7 +451,7 @@ Shader version: 500
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 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 171
 
diff --git a/Test/baseResults/hlsl.load.buffer.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
index b9a4b52b2..4cb5f9546 100644
--- a/Test/baseResults/hlsl.load.buffer.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.buffer.dx10.frag.out
@@ -163,7 +163,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 72
 
diff --git a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
index bc8b3c116..309778a5c 100644
--- a/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.buffer.float.dx10.frag.out
@@ -169,7 +169,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 75
 
diff --git a/Test/baseResults/hlsl.load.offset.dx10.frag.out b/Test/baseResults/hlsl.load.offset.dx10.frag.out
index 4198a06b6..23e704c55 100644
--- a/Test/baseResults/hlsl.load.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offset.dx10.frag.out
@@ -559,7 +559,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 201
 
diff --git a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
index e1c57d518..1c7779790 100644
--- a/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.offsetarray.dx10.frag.out
@@ -433,7 +433,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 174
 
diff --git a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
index a6025def1..dfaaabae6 100644
--- a/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwbuffer.dx10.frag.out
@@ -109,7 +109,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 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
 
diff --git a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out
index 7751173a8..9bd7e9571 100644
--- a/Test/baseResults/hlsl.load.rwtexture.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwtexture.array.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 119
 
diff --git a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
index 905af7df2..045683e07 100644
--- a/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
+++ b/Test/baseResults/hlsl.load.rwtexture.dx10.frag.out
@@ -241,7 +241,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 132
 
diff --git a/Test/baseResults/hlsl.logical.binary.frag.out b/Test/baseResults/hlsl.logical.binary.frag.out
index 932d8b73f..8425f45e0 100644
--- a/Test/baseResults/hlsl.logical.binary.frag.out
+++ b/Test/baseResults/hlsl.logical.binary.frag.out
@@ -127,7 +127,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 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
 
diff --git a/Test/baseResults/hlsl.logical.binary.vec.frag.out b/Test/baseResults/hlsl.logical.binary.vec.frag.out
index 175af1e5d..8b63fe861 100644
--- a/Test/baseResults/hlsl.logical.binary.vec.frag.out
+++ b/Test/baseResults/hlsl.logical.binary.vec.frag.out
@@ -253,7 +253,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of bool b4a,  uniform 4-component vector of bool b4b,  uniform bool b1a,  uniform bool b1b})
 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 115
 
diff --git a/Test/baseResults/hlsl.logical.unary.frag.out b/Test/baseResults/hlsl.logical.unary.frag.out
index 43c4f9880..ab62b5daa 100644
--- a/Test/baseResults/hlsl.logical.unary.frag.out
+++ b/Test/baseResults/hlsl.logical.unary.frag.out
@@ -183,7 +183,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 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 84
 
diff --git a/Test/baseResults/hlsl.logicalConvert.frag.out b/Test/baseResults/hlsl.logicalConvert.frag.out
index 7effb89f3..39c2b468f 100755
--- a/Test/baseResults/hlsl.logicalConvert.frag.out
+++ b/Test/baseResults/hlsl.logicalConvert.frag.out
@@ -253,7 +253,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 50
 
diff --git a/Test/baseResults/hlsl.loopattr.frag.out b/Test/baseResults/hlsl.loopattr.frag.out
index ce6978274..f7f64514e 100644
--- a/Test/baseResults/hlsl.loopattr.frag.out
+++ b/Test/baseResults/hlsl.loopattr.frag.out
@@ -135,7 +135,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 54
 
diff --git a/Test/baseResults/hlsl.matNx1.frag.out b/Test/baseResults/hlsl.matNx1.frag.out
index 9fdf51df0..c42903406 100644
--- a/Test/baseResults/hlsl.matNx1.frag.out
+++ b/Test/baseResults/hlsl.matNx1.frag.out
@@ -151,7 +151,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 77
 
diff --git a/Test/baseResults/hlsl.matType.bool.frag.out b/Test/baseResults/hlsl.matType.bool.frag.out
index 0e03b763f..0844ae312 100644
--- a/Test/baseResults/hlsl.matType.bool.frag.out
+++ b/Test/baseResults/hlsl.matType.bool.frag.out
@@ -231,7 +231,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 130
 
diff --git a/Test/baseResults/hlsl.matType.frag.out b/Test/baseResults/hlsl.matType.frag.out
index d6a06d135..062b16af6 100755
--- a/Test/baseResults/hlsl.matType.frag.out
+++ b/Test/baseResults/hlsl.matType.frag.out
@@ -30,7 +30,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 1-component vector of float f1,  uniform 1X1 matrix of float fmat11,  uniform 4X1 matrix of float fmat41,  uniform 1X2 matrix of float fmat12,  uniform 2X3 matrix of double dmat23,  uniform 4X4 matrix of int int44})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 30
 
diff --git a/Test/baseResults/hlsl.matType.int.frag.out b/Test/baseResults/hlsl.matType.int.frag.out
index 1d369ba08..7275ef018 100644
--- a/Test/baseResults/hlsl.matType.int.frag.out
+++ b/Test/baseResults/hlsl.matType.int.frag.out
@@ -397,7 +397,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 232
 
diff --git a/Test/baseResults/hlsl.matpack-1.frag.out b/Test/baseResults/hlsl.matpack-1.frag.out
index 279ed1dd2..5e5ef6bad 100644
--- a/Test/baseResults/hlsl.matpack-1.frag.out
+++ b/Test/baseResults/hlsl.matpack-1.frag.out
@@ -99,7 +99,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform structure{layout( row_major) temp 4X4 matrix of float mat1, layout( column_major) temp 4X4 matrix of float mat2,  temp 4-component vector of float vec1,  temp float foo} g_MyBuffer1, layout( row_major std140) uniform structure{layout( column_major) temp 4X4 matrix of float mat1,  temp 4-component vector of float vec1} g_MyBuffer2, layout( row_major std140) uniform 4X4 matrix of float mat1a})
 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
 
diff --git a/Test/baseResults/hlsl.matpack-pragma.frag.out b/Test/baseResults/hlsl.matpack-pragma.frag.out
index afe6e2ca1..f5fd07d15 100644
--- a/Test/baseResults/hlsl.matpack-pragma.frag.out
+++ b/Test/baseResults/hlsl.matpack-pragma.frag.out
@@ -169,7 +169,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform structure{layout( row_major) temp 4X4 matrix of float mat1, layout( column_major) temp 4X4 matrix of float mat2, layout( column_major) temp 4X4 matrix of float mat3} g_MyBuffer1, layout( row_major std140) uniform structure{layout( row_major) temp 4X4 matrix of float mat1, layout( column_major) temp 4X4 matrix of float mat2, layout( row_major) temp 4X4 matrix of float mat3} g_MyBuffer2, layout( row_major std140) uniform 4X4 matrix of float mat1a})
 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 44
 
diff --git a/Test/baseResults/hlsl.matrixSwizzle.vert.out b/Test/baseResults/hlsl.matrixSwizzle.vert.out
index efa21ba76..9bc00bb0c 100755
--- a/Test/baseResults/hlsl.matrixSwizzle.vert.out
+++ b/Test/baseResults/hlsl.matrixSwizzle.vert.out
@@ -676,7 +676,7 @@ Shader version: 500
 0:?     'inf' (layout( location=0) in float)
 
 Missing functionality: matrix swizzle
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 118
 
diff --git a/Test/baseResults/hlsl.matrixindex.frag.out b/Test/baseResults/hlsl.matrixindex.frag.out
index f81357a5f..9a3f3f079 100644
--- a/Test/baseResults/hlsl.matrixindex.frag.out
+++ b/Test/baseResults/hlsl.matrixindex.frag.out
@@ -271,7 +271,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int idx,  uniform 3X2 matrix of float um})
 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 83
 
diff --git a/Test/baseResults/hlsl.max.frag.out b/Test/baseResults/hlsl.max.frag.out
index 7c01f030e..acade7ca6 100755
--- a/Test/baseResults/hlsl.max.frag.out
+++ b/Test/baseResults/hlsl.max.frag.out
@@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
 0:?     'input1' (layout( location=0) in 4-component vector of float)
 0:?     'input2' (layout( location=1) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 33
 
diff --git a/Test/baseResults/hlsl.memberFunCall.frag.out b/Test/baseResults/hlsl.memberFunCall.frag.out
index dd637e0c4..cd3eeb9d9 100755
--- a/Test/baseResults/hlsl.memberFunCall.frag.out
+++ b/Test/baseResults/hlsl.memberFunCall.frag.out
@@ -151,7 +151,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 73
 
diff --git a/Test/baseResults/hlsl.mintypes.frag.out b/Test/baseResults/hlsl.mintypes.frag.out
index 6bd61e5d7..4554de5cd 100644
--- a/Test/baseResults/hlsl.mintypes.frag.out
+++ b/Test/baseResults/hlsl.mintypes.frag.out
@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform mediump float b1a,  uniform mediump float b1b})
 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 70
 
diff --git a/Test/baseResults/hlsl.mip.operator.frag.out b/Test/baseResults/hlsl.mip.operator.frag.out
index 460c4c729..11c8f53e8 100644
--- a/Test/baseResults/hlsl.mip.operator.frag.out
+++ b/Test/baseResults/hlsl.mip.operator.frag.out
@@ -127,7 +127,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tTex2df4' ( 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 61
 
diff --git a/Test/baseResults/hlsl.mul-truncate.frag.out b/Test/baseResults/hlsl.mul-truncate.frag.out
index 340dc3278..b27af502f 100644
--- a/Test/baseResults/hlsl.mul-truncate.frag.out
+++ b/Test/baseResults/hlsl.mul-truncate.frag.out
@@ -382,7 +382,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform 4X4 matrix of float m44, layout( row_major std140) uniform 4X3 matrix of float m43, layout( row_major std140) uniform 3X4 matrix of float m34, layout( row_major std140) uniform 3X3 matrix of float m33, layout( row_major std140) uniform 2X4 matrix of float m24, layout( row_major std140) uniform 4X2 matrix of float m42, layout( row_major std140) uniform 4-component vector of float v4, layout( row_major std140) uniform 3-component vector of float v3, layout( row_major std140) uniform 2-component vector of float v2})
 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 231
 
diff --git a/Test/baseResults/hlsl.multiDescriptorSet.frag.out b/Test/baseResults/hlsl.multiDescriptorSet.frag.out
index d95fbb56c..5d0854342 100644
--- a/Test/baseResults/hlsl.multiDescriptorSet.frag.out
+++ b/Test/baseResults/hlsl.multiDescriptorSet.frag.out
@@ -1,5 +1,5 @@
 hlsl.multiDescriptorSet.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 92
 
diff --git a/Test/baseResults/hlsl.multiEntry.vert.out b/Test/baseResults/hlsl.multiEntry.vert.out
index 8eeec31fa..5c56f33dd 100755
--- a/Test/baseResults/hlsl.multiEntry.vert.out
+++ b/Test/baseResults/hlsl.multiEntry.vert.out
@@ -69,7 +69,7 @@ Shader version: 500
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 0:?     'Index' ( in uint VertexIndex)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 41
 
diff --git a/Test/baseResults/hlsl.multiReturn.frag.out b/Test/baseResults/hlsl.multiReturn.frag.out
index ad9971430..dc978cc05 100755
--- a/Test/baseResults/hlsl.multiReturn.frag.out
+++ b/Test/baseResults/hlsl.multiReturn.frag.out
@@ -47,7 +47,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{layout( row_major std140) uniform structure{ temp float f,  temp 3-component vector of float v,  temp 3X3 matrix of float m} s})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 42
 
diff --git a/Test/baseResults/hlsl.namespace.frag.out b/Test/baseResults/hlsl.namespace.frag.out
index 57f53ee6c..b4b8d6ccb 100755
--- a/Test/baseResults/hlsl.namespace.frag.out
+++ b/Test/baseResults/hlsl.namespace.frag.out
@@ -101,7 +101,7 @@ gl_FragCoord origin is upper left
 0:?     'N2::gf' ( global float)
 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 54
 
diff --git a/Test/baseResults/hlsl.nonint-index.frag.out b/Test/baseResults/hlsl.nonint-index.frag.out
index 1073706cd..644733b47 100644
--- a/Test/baseResults/hlsl.nonint-index.frag.out
+++ b/Test/baseResults/hlsl.nonint-index.frag.out
@@ -87,7 +87,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out float)
 0:?     'input' (layout( location=0) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 
diff --git a/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out b/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out
index 60928c5f7..e8a80082a 100755
--- a/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out
+++ b/Test/baseResults/hlsl.nonstaticMemberFunction.frag.out
@@ -267,7 +267,7 @@ gl_FragCoord origin is upper left
 0:?     'j' ( global 2-component vector of float)
 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 111
 
diff --git a/Test/baseResults/hlsl.numericsuffixes.frag.out b/Test/baseResults/hlsl.numericsuffixes.frag.out
index 1967d3f33..a75a7e187 100644
--- a/Test/baseResults/hlsl.numericsuffixes.frag.out
+++ b/Test/baseResults/hlsl.numericsuffixes.frag.out
@@ -191,7 +191,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 54
 
diff --git a/Test/baseResults/hlsl.numthreads.comp.out b/Test/baseResults/hlsl.numthreads.comp.out
index 910141477..c6ec011d2 100644
--- a/Test/baseResults/hlsl.numthreads.comp.out
+++ b/Test/baseResults/hlsl.numthreads.comp.out
@@ -43,7 +43,7 @@ local_size = (4, 4, 2)
 0:?   Linker Objects
 0:?     'tid' ( in 3-component vector of uint GlobalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 23
 
diff --git a/Test/baseResults/hlsl.opaque-type-bug.frag.out b/Test/baseResults/hlsl.opaque-type-bug.frag.out
index 2aa0b9537..42a0494dd 100644
--- a/Test/baseResults/hlsl.opaque-type-bug.frag.out
+++ b/Test/baseResults/hlsl.opaque-type-bug.frag.out
@@ -57,7 +57,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'MyTexture' (layout( binding=0) uniform texture2D)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 
diff --git a/Test/baseResults/hlsl.overload.frag.out b/Test/baseResults/hlsl.overload.frag.out
index 88ae2b1b7..079166cc6 100755
--- a/Test/baseResults/hlsl.overload.frag.out
+++ b/Test/baseResults/hlsl.overload.frag.out
@@ -733,7 +733,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 520
 
diff --git a/Test/baseResults/hlsl.params.default.frag.out b/Test/baseResults/hlsl.params.default.frag.out
index 5b227a0bb..bc2f57d22 100644
--- a/Test/baseResults/hlsl.params.default.frag.out
+++ b/Test/baseResults/hlsl.params.default.frag.out
@@ -375,7 +375,7 @@ gl_FragCoord origin is upper left
 0:?       -42 (const int)
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 178
 
diff --git a/Test/baseResults/hlsl.partialFlattenLocal.vert.out b/Test/baseResults/hlsl.partialFlattenLocal.vert.out
index 29f69ede4..5acae6f83 100755
--- a/Test/baseResults/hlsl.partialFlattenLocal.vert.out
+++ b/Test/baseResults/hlsl.partialFlattenLocal.vert.out
@@ -236,7 +236,7 @@ Shader version: 500
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 0:?     'pos' (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 90
 
diff --git a/Test/baseResults/hlsl.partialFlattenMixed.vert.out b/Test/baseResults/hlsl.partialFlattenMixed.vert.out
index 8c175da44..e14987c2e 100755
--- a/Test/baseResults/hlsl.partialFlattenMixed.vert.out
+++ b/Test/baseResults/hlsl.partialFlattenMixed.vert.out
@@ -90,7 +90,7 @@ Shader version: 500
 0:?     '@entryPointOutput' ( out 4-component vector of float Position)
 0:?     'pos' (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 43
 
diff --git a/Test/baseResults/hlsl.partialInit.frag.out b/Test/baseResults/hlsl.partialInit.frag.out
index 1ea97b558..3b449fe53 100755
--- a/Test/baseResults/hlsl.partialInit.frag.out
+++ b/Test/baseResults/hlsl.partialInit.frag.out
@@ -398,7 +398,7 @@ gl_FragCoord origin is upper left
 0:?     'ci' ( const int)
 0:?       0 (const int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 104
 
diff --git a/Test/baseResults/hlsl.pp.line.frag.out b/Test/baseResults/hlsl.pp.line.frag.out
index bc8999dc7..01caf9681 100644
--- a/Test/baseResults/hlsl.pp.line.frag.out
+++ b/Test/baseResults/hlsl.pp.line.frag.out
@@ -117,7 +117,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 42
 
diff --git a/Test/baseResults/hlsl.pp.vert.out b/Test/baseResults/hlsl.pp.vert.out
index b20f38ea0..0aee624f2 100755
--- a/Test/baseResults/hlsl.pp.vert.out
+++ b/Test/baseResults/hlsl.pp.vert.out
@@ -25,7 +25,7 @@ Shader version: 500
 0:?   Linker Objects
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int goodGlobal1,  uniform int goodGlobal2})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 13
 
diff --git a/Test/baseResults/hlsl.precedence.frag.out b/Test/baseResults/hlsl.precedence.frag.out
index 95ccc9265..f227e8b31 100755
--- a/Test/baseResults/hlsl.precedence.frag.out
+++ b/Test/baseResults/hlsl.precedence.frag.out
@@ -147,7 +147,7 @@ gl_FragCoord origin is upper left
 0:?     'a3' (layout( location=2) in 4-component vector of float)
 0:?     'a4' (layout( location=3) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 65
 
diff --git a/Test/baseResults/hlsl.precedence2.frag.out b/Test/baseResults/hlsl.precedence2.frag.out
index b41117034..7a0440859 100755
--- a/Test/baseResults/hlsl.precedence2.frag.out
+++ b/Test/baseResults/hlsl.precedence2.frag.out
@@ -113,7 +113,7 @@ gl_FragCoord origin is upper left
 0:?     'a3' (layout( location=2) flat in int)
 0:?     'a4' (layout( location=3) flat in int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 56
 
diff --git a/Test/baseResults/hlsl.precise.frag.out b/Test/baseResults/hlsl.precise.frag.out
index c4a50bca0..956fc0f88 100644
--- a/Test/baseResults/hlsl.precise.frag.out
+++ b/Test/baseResults/hlsl.precise.frag.out
@@ -75,7 +75,7 @@ gl_FragCoord origin is upper left
 0:?     'precisefloat' ( noContraction global float)
 0:?     '@entryPointOutput.color' (layout( location=0) noContraction out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 37
 
diff --git a/Test/baseResults/hlsl.preprocessor.frag.out b/Test/baseResults/hlsl.preprocessor.frag.out
index 83881c99e..b59141f8a 100644
--- a/Test/baseResults/hlsl.preprocessor.frag.out
+++ b/Test/baseResults/hlsl.preprocessor.frag.out
@@ -93,7 +93,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 40
 
diff --git a/Test/baseResults/hlsl.promote.atomic.frag.out b/Test/baseResults/hlsl.promote.atomic.frag.out
index e832fc712..2be022652 100644
--- a/Test/baseResults/hlsl.promote.atomic.frag.out
+++ b/Test/baseResults/hlsl.promote.atomic.frag.out
@@ -63,7 +63,7 @@ gl_FragCoord origin is upper left
 0:?     's_uintbuff' (layout( r32ui) uniform uimageBuffer)
 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 36
 
diff --git a/Test/baseResults/hlsl.promote.binary.frag.out b/Test/baseResults/hlsl.promote.binary.frag.out
index 637c3e542..81ac024b7 100644
--- a/Test/baseResults/hlsl.promote.binary.frag.out
+++ b/Test/baseResults/hlsl.promote.binary.frag.out
@@ -171,7 +171,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform bool bval,  uniform 4-component vector of bool bval4,  uniform int ival,  uniform 4-component vector of int ival4,  uniform float fval,  uniform 4-component vector of float fval4})
 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 83
 
diff --git a/Test/baseResults/hlsl.promote.vec1.frag.out b/Test/baseResults/hlsl.promote.vec1.frag.out
index d83bf6906..c971ff30f 100644
--- a/Test/baseResults/hlsl.promote.vec1.frag.out
+++ b/Test/baseResults/hlsl.promote.vec1.frag.out
@@ -79,7 +79,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 31
 
diff --git a/Test/baseResults/hlsl.promotions.frag.out b/Test/baseResults/hlsl.promotions.frag.out
index ad4d1ab11..5b529e913 100644
--- a/Test/baseResults/hlsl.promotions.frag.out
+++ b/Test/baseResults/hlsl.promotions.frag.out
@@ -1581,7 +1581,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 3-component vector of int i3,  uniform 3-component vector of bool b3,  uniform 3-component vector of float f3,  uniform 3-component vector of uint u3,  uniform 3-component vector of double d3,  uniform int is,  uniform bool bs,  uniform float fs,  uniform uint us,  uniform double ds})
 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 596
 
diff --git a/Test/baseResults/hlsl.rw.atomics.frag.out b/Test/baseResults/hlsl.rw.atomics.frag.out
index 5b01f9cf8..1311d2373 100644
--- a/Test/baseResults/hlsl.rw.atomics.frag.out
+++ b/Test/baseResults/hlsl.rw.atomics.frag.out
@@ -3945,7 +3945,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform uint u1,  uniform 2-component vector of uint u2,  uniform 3-component vector of uint u3,  uniform uint u1b,  uniform uint u1c,  uniform int i1,  uniform 2-component vector of int i2,  uniform 3-component vector of int i3,  uniform int i1b,  uniform int i1c})
 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 1147
 
diff --git a/Test/baseResults/hlsl.rw.bracket.frag.out b/Test/baseResults/hlsl.rw.bracket.frag.out
index c1b6e8bdd..e4640a513 100644
--- a/Test/baseResults/hlsl.rw.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.bracket.frag.out
@@ -1743,7 +1743,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4,  uniform 4-component vector of float uf4,  uniform 4-component vector of int ui4,  uniform 4-component vector of uint uu4})
 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 607
 
diff --git a/Test/baseResults/hlsl.rw.register.frag.out b/Test/baseResults/hlsl.rw.register.frag.out
index 5f10dd850..f563c32a1 100644
--- a/Test/baseResults/hlsl.rw.register.frag.out
+++ b/Test/baseResults/hlsl.rw.register.frag.out
@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tBuf1du1' (layout( binding=3 r32ui) uniform uimageBuffer)
 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 42
 
diff --git a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
index 367bd97d0..8e7ab9de3 100644
--- a/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.scalar.bracket.frag.out
@@ -1689,7 +1689,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4,  uniform float uf1,  uniform int ui1,  uniform uint uu1})
 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 571
 
diff --git a/Test/baseResults/hlsl.rw.swizzle.frag.out b/Test/baseResults/hlsl.rw.swizzle.frag.out
index aa380858d..3f6b163af 100644
--- a/Test/baseResults/hlsl.rw.swizzle.frag.out
+++ b/Test/baseResults/hlsl.rw.swizzle.frag.out
@@ -201,7 +201,7 @@ gl_FragCoord origin is upper left
 0:?     'buf' (layout( rgba32f) uniform imageBuffer)
 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 63
 
diff --git a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
index 357c9140e..6100899d5 100644
--- a/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
+++ b/Test/baseResults/hlsl.rw.vec2.bracket.frag.out
@@ -1707,7 +1707,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4,  uniform 2-component vector of float uf2,  uniform 2-component vector of int ui2,  uniform 2-component vector of uint uu2})
 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 605
 
diff --git a/Test/baseResults/hlsl.sample.array.dx10.frag.out b/Test/baseResults/hlsl.sample.array.dx10.frag.out
index fcbe66b2e..68f5e3ca0 100644
--- a/Test/baseResults/hlsl.sample.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.array.dx10.frag.out
@@ -319,7 +319,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 146
 
diff --git a/Test/baseResults/hlsl.sample.basic.dx10.frag.out b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
index 1e5e52764..88a35b4d3 100644
--- a/Test/baseResults/hlsl.sample.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.basic.dx10.frag.out
@@ -547,7 +547,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 198
 
diff --git a/Test/baseResults/hlsl.sample.offset.dx10.frag.out b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
index ae4ad6afe..de7128b1e 100644
--- a/Test/baseResults/hlsl.sample.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offset.dx10.frag.out
@@ -361,7 +361,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 161
 
diff --git a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
index a33903aca..8956c1554 100644
--- a/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.offsetarray.dx10.frag.out
@@ -271,7 +271,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 118
 
diff --git a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
index ef249396a..55d87a378 100644
--- a/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
+++ b/Test/baseResults/hlsl.sample.sub-vec4.dx10.frag.out
@@ -153,7 +153,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tTex1df4' ( uniform texture1D)
 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 72
 
diff --git a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out b/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
index e25507d3e..a3acb1ecc 100644
--- a/Test/baseResults/hlsl.samplebias.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.array.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 146
 
diff --git a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
index be32c9d94..615c6da04 100644
--- a/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
@@ -421,7 +421,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 170
 
diff --git a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
index b8459de66..000c84a87 100644
--- a/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
@@ -397,7 +397,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 161
 
diff --git a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
index f83009ab1..67cc41fd2 100644
--- a/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplebias.offsetarray.dx10.frag.out
@@ -295,7 +295,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 118
 
diff --git a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
index 9125304a7..33df30c34 100644
--- a/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.array.dx10.frag.out
@@ -395,7 +395,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 209
 
diff --git a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
index 50dafee67..0daeb6526 100644
--- a/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.basic.dx10.frag.out
@@ -377,7 +377,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 198
 
diff --git a/Test/baseResults/hlsl.samplecmp.dualmode.frag.out b/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
index 206eb5b84..d54bc5119 100644
--- a/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.dualmode.frag.out
@@ -84,7 +84,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'g_tTex' (layout( binding=3) uniform texture1D)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 43
 
diff --git a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
index eed2f51ad..ed20ddc25 100644
--- a/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offset.dx10.frag.out
@@ -323,7 +323,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 167
 
diff --git a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
index d7458c1fd..812ef6545 100644
--- a/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmp.offsetarray.dx10.frag.out
@@ -335,7 +335,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 178
 
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
index ecab5058b..b5a4d7118 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.array.dx10.frag.out
@@ -431,7 +431,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 210
 
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
index e4422332c..fca447482 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.basic.dx10.frag.out
@@ -413,7 +413,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 199
 
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
index 96b94fcb3..83b48cf4b 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offset.dx10.frag.out
@@ -347,7 +347,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 168
 
diff --git a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
index 3be329adb..62fb50a90 100644
--- a/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplecmplevelzero.offsetarray.dx10.frag.out
@@ -359,7 +359,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 179
 
diff --git a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
index a42791ecc..ec78a13ca 100644
--- a/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.array.dx10.frag.out
@@ -427,7 +427,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 140
 
diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
index 0635bbc5a..1d1ab509b 100644
--- a/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.frag.out
@@ -529,7 +529,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 175
 
diff --git a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
index 59efb541d..feffb4a25 100644
--- a/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.samplegrad.basic.dx10.vert.out
@@ -493,7 +493,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 166
 
diff --git a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
index ed6df1a59..5ee5aa137 100644
--- a/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offset.dx10.frag.out
@@ -469,7 +469,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 166
 
diff --git a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
index 2b10ac186..167c247ea 100644
--- a/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplegrad.offsetarray.dx10.frag.out
@@ -337,7 +337,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 120
 
diff --git a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
index 4188d8f27..8caeabfd0 100644
--- a/Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.array.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 147
 
diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
index a0b7bd1b9..1e66d6dd1 100644
--- a/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
@@ -423,7 +423,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 172
 
diff --git a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
index 788d4d8cb..c202784f1 100644
--- a/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
+++ b/Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
@@ -385,7 +385,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 162
 
diff --git a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
index 826a2deba..dcbe7bc57 100644
--- a/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offset.dx10.frag.out
@@ -397,7 +397,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 162
 
diff --git a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
index 5fd4aaa53..a7ec28a17 100644
--- a/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
+++ b/Test/baseResults/hlsl.samplelevel.offsetarray.dx10.frag.out
@@ -295,7 +295,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 119
 
diff --git a/Test/baseResults/hlsl.scalar-length.frag.out b/Test/baseResults/hlsl.scalar-length.frag.out
index 047e8d2ef..5f121c65f 100644
--- a/Test/baseResults/hlsl.scalar-length.frag.out
+++ b/Test/baseResults/hlsl.scalar-length.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 30
 
diff --git a/Test/baseResults/hlsl.scalar2matrix.frag.out b/Test/baseResults/hlsl.scalar2matrix.frag.out
index 453c50e1f..ac80dc018 100644
--- a/Test/baseResults/hlsl.scalar2matrix.frag.out
+++ b/Test/baseResults/hlsl.scalar2matrix.frag.out
@@ -373,7 +373,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 96
 
diff --git a/Test/baseResults/hlsl.scalarCast.vert.out b/Test/baseResults/hlsl.scalarCast.vert.out
index ee3a1c518..27983f988 100755
--- a/Test/baseResults/hlsl.scalarCast.vert.out
+++ b/Test/baseResults/hlsl.scalarCast.vert.out
@@ -321,7 +321,7 @@ Shader version: 500
 0:?     '@entryPointOutput.position' ( out 4-component vector of float Position)
 0:?     '@entryPointOutput.texCoord' (layout( location=0) out 2-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 120
 
diff --git a/Test/baseResults/hlsl.scope.frag.out b/Test/baseResults/hlsl.scope.frag.out
index aaf94ef3c..92f461f73 100755
--- a/Test/baseResults/hlsl.scope.frag.out
+++ b/Test/baseResults/hlsl.scope.frag.out
@@ -101,7 +101,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 49
 
diff --git a/Test/baseResults/hlsl.semantic-1.vert.out b/Test/baseResults/hlsl.semantic-1.vert.out
index f470be1f7..d45f03f1b 100644
--- a/Test/baseResults/hlsl.semantic-1.vert.out
+++ b/Test/baseResults/hlsl.semantic-1.vert.out
@@ -241,7 +241,7 @@ Shader version: 500
 0:?     '@entryPointOutput.UV3' (layout( location=4) out 2-component vector of float)
 0:?     'v' (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 84
 
diff --git a/Test/baseResults/hlsl.semantic.geom.out b/Test/baseResults/hlsl.semantic.geom.out
index 630b9c377..3378d21fb 100755
--- a/Test/baseResults/hlsl.semantic.geom.out
+++ b/Test/baseResults/hlsl.semantic.geom.out
@@ -155,7 +155,7 @@ output primitive = line_strip
 0:?     'OutputStream.clip0' ( out 1-element array of float ClipDistance)
 0:?     'OutputStream.cull0' ( out 1-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 65
 
diff --git a/Test/baseResults/hlsl.semantic.vert.out b/Test/baseResults/hlsl.semantic.vert.out
index 80d3ab2e2..885c89862 100755
--- a/Test/baseResults/hlsl.semantic.vert.out
+++ b/Test/baseResults/hlsl.semantic.vert.out
@@ -209,7 +209,7 @@ Shader version: 500
 0:?     '@entryPointOutput.clip1' ( out 2-element array of float ClipDistance)
 0:?     '@entryPointOutput.cull1' ( out 2-element array of float CullDistance)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 70
 
diff --git a/Test/baseResults/hlsl.semicolons.frag.out b/Test/baseResults/hlsl.semicolons.frag.out
index 104cc294d..1138dafc4 100644
--- a/Test/baseResults/hlsl.semicolons.frag.out
+++ b/Test/baseResults/hlsl.semicolons.frag.out
@@ -73,7 +73,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 31
 
diff --git a/Test/baseResults/hlsl.shapeConv.frag.out b/Test/baseResults/hlsl.shapeConv.frag.out
index 4be177a40..afcc1f6fb 100755
--- a/Test/baseResults/hlsl.shapeConv.frag.out
+++ b/Test/baseResults/hlsl.shapeConv.frag.out
@@ -320,7 +320,7 @@ gl_FragCoord origin is upper left
 0:48            3.000000
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 127
 
diff --git a/Test/baseResults/hlsl.shapeConvRet.frag.out b/Test/baseResults/hlsl.shapeConvRet.frag.out
index ae6f094b5..3a9e64471 100755
--- a/Test/baseResults/hlsl.shapeConvRet.frag.out
+++ b/Test/baseResults/hlsl.shapeConvRet.frag.out
@@ -67,7 +67,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'f' (layout( location=0) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 
diff --git a/Test/baseResults/hlsl.sin.frag.out b/Test/baseResults/hlsl.sin.frag.out
index 5a6f6ef0d..cfbfd9ce7 100755
--- a/Test/baseResults/hlsl.sin.frag.out
+++ b/Test/baseResults/hlsl.sin.frag.out
@@ -51,7 +51,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 26
 
diff --git a/Test/baseResults/hlsl.snorm.uav.comp.out b/Test/baseResults/hlsl.snorm.uav.comp.out
index 181cb4e4f..95557f073 100644
--- a/Test/baseResults/hlsl.snorm.uav.comp.out
+++ b/Test/baseResults/hlsl.snorm.uav.comp.out
@@ -111,7 +111,7 @@ local_size = (16, 16, 1)
 0:?     'ResultOutS' (layout( binding=1 rgba32f) uniform image3D)
 0:?     'tid' ( in 3-component vector of uint GlobalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 54
 
diff --git a/Test/baseResults/hlsl.staticMemberFunction.frag.out b/Test/baseResults/hlsl.staticMemberFunction.frag.out
index 4efdb0b53..aa14f5faa 100755
--- a/Test/baseResults/hlsl.staticMemberFunction.frag.out
+++ b/Test/baseResults/hlsl.staticMemberFunction.frag.out
@@ -117,7 +117,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 54
 
diff --git a/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out b/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
index fe4d2d2b7..7674acda5 100644
--- a/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
+++ b/Test/baseResults/hlsl.store.rwbyteaddressbuffer.type.comp.out
@@ -95,7 +95,7 @@ local_size = (64, 1, 1)
 0:?     'buffer' (layout( row_major std430) buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
 0:?     'dispatchThreadID' ( in 3-component vector of uint GlobalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 42
 
diff --git a/Test/baseResults/hlsl.string.frag.out b/Test/baseResults/hlsl.string.frag.out
index 25903b069..31dbc04fe 100755
--- a/Test/baseResults/hlsl.string.frag.out
+++ b/Test/baseResults/hlsl.string.frag.out
@@ -49,7 +49,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out float)
 0:?     'f' (layout( location=0) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 
diff --git a/Test/baseResults/hlsl.stringtoken.frag.out b/Test/baseResults/hlsl.stringtoken.frag.out
index a210de701..9a1fa81e0 100644
--- a/Test/baseResults/hlsl.stringtoken.frag.out
+++ b/Test/baseResults/hlsl.stringtoken.frag.out
@@ -69,7 +69,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float TestUF})
 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 34
 
diff --git a/Test/baseResults/hlsl.struct.frag.out b/Test/baseResults/hlsl.struct.frag.out
index ae37ddde7..8ca14cc12 100755
--- a/Test/baseResults/hlsl.struct.frag.out
+++ b/Test/baseResults/hlsl.struct.frag.out
@@ -211,7 +211,7 @@ gl_FragCoord origin is upper left
 0:?     's.ff3' (layout( location=6) flat in bool)
 0:?     's.ff4' (layout( location=7) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 102
 
diff --git a/Test/baseResults/hlsl.struct.split-1.vert.out b/Test/baseResults/hlsl.struct.split-1.vert.out
index 02656c1c6..c0f3a53bc 100644
--- a/Test/baseResults/hlsl.struct.split-1.vert.out
+++ b/Test/baseResults/hlsl.struct.split-1.vert.out
@@ -195,7 +195,7 @@ Shader version: 500
 0:?     'vsin.x1_in' (layout( location=2) in int)
 0:?     'Pos_loose' (layout( location=3) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 70
 
diff --git a/Test/baseResults/hlsl.struct.split.array.geom.out b/Test/baseResults/hlsl.struct.split.array.geom.out
index 2fe3897f1..b70ccb6a3 100644
--- a/Test/baseResults/hlsl.struct.split.array.geom.out
+++ b/Test/baseResults/hlsl.struct.split.array.geom.out
@@ -159,7 +159,7 @@ output primitive = triangle_strip
 0:?     'OutputStream.TerrainPos' (layout( location=1) out 3-component vector of float)
 0:?     'OutputStream.VertexID' (layout( location=2) out uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 82
 
diff --git a/Test/baseResults/hlsl.struct.split.assign.frag.out b/Test/baseResults/hlsl.struct.split.assign.frag.out
index 91ff540d1..013ee1b28 100644
--- a/Test/baseResults/hlsl.struct.split.assign.frag.out
+++ b/Test/baseResults/hlsl.struct.split.assign.frag.out
@@ -207,7 +207,7 @@ gl_FragCoord origin is upper left
 0:?     'input[1].f' (layout( location=2) in float)
 0:?     'input[2].f' (layout( location=3) in float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 66
 
diff --git a/Test/baseResults/hlsl.struct.split.call.vert.out b/Test/baseResults/hlsl.struct.split.call.vert.out
index ed9e96292..de5b7df02 100644
--- a/Test/baseResults/hlsl.struct.split.call.vert.out
+++ b/Test/baseResults/hlsl.struct.split.call.vert.out
@@ -213,7 +213,7 @@ Shader version: 500
 0:?     'vsin.Pos_in' (layout( location=1) in 4-component vector of float)
 0:?     'vsin.x1_in' (layout( location=2) in int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 77
 
diff --git a/Test/baseResults/hlsl.struct.split.nested.geom.out b/Test/baseResults/hlsl.struct.split.nested.geom.out
index 23dbbbf19..7ec508f44 100644
--- a/Test/baseResults/hlsl.struct.split.nested.geom.out
+++ b/Test/baseResults/hlsl.struct.split.nested.geom.out
@@ -447,7 +447,7 @@ output primitive = triangle_strip
 0:?     'ts.contains_no_builtin_io.m0_array[1]' (layout( location=2) out float)
 0:?     'ts.contains_no_builtin_io.m1' (layout( location=3) out int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 100
 
diff --git a/Test/baseResults/hlsl.struct.split.trivial.geom.out b/Test/baseResults/hlsl.struct.split.trivial.geom.out
index 7a49ceca4..79dd1d579 100644
--- a/Test/baseResults/hlsl.struct.split.trivial.geom.out
+++ b/Test/baseResults/hlsl.struct.split.trivial.geom.out
@@ -191,7 +191,7 @@ output primitive = triangle_strip
 0:?     'i.pos' ( in 3-element array of 4-component vector of float Position)
 0:?     'ts.pos' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 67
 
diff --git a/Test/baseResults/hlsl.struct.split.trivial.vert.out b/Test/baseResults/hlsl.struct.split.trivial.vert.out
index 038c53d12..0c98e6fc3 100644
--- a/Test/baseResults/hlsl.struct.split.trivial.vert.out
+++ b/Test/baseResults/hlsl.struct.split.trivial.vert.out
@@ -97,7 +97,7 @@ Shader version: 500
 0:?     'vsin.Pos_in' (layout( location=0) in 4-component vector of float)
 0:?     'Pos_loose' (layout( location=1) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 45
 
diff --git a/Test/baseResults/hlsl.structIoFourWay.frag.out b/Test/baseResults/hlsl.structIoFourWay.frag.out
index 96df92ace..614770397 100755
--- a/Test/baseResults/hlsl.structIoFourWay.frag.out
+++ b/Test/baseResults/hlsl.structIoFourWay.frag.out
@@ -161,7 +161,7 @@ using depth_greater
 0:?     't.d' (layout( location=2) in float)
 0:?     't.normal' (layout( location=3) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 65
 
diff --git a/Test/baseResults/hlsl.structStructName.frag.out b/Test/baseResults/hlsl.structStructName.frag.out
index d575a65bb..3b18239e7 100755
--- a/Test/baseResults/hlsl.structStructName.frag.out
+++ b/Test/baseResults/hlsl.structStructName.frag.out
@@ -43,7 +43,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 22
 
diff --git a/Test/baseResults/hlsl.structarray.flatten.frag.out b/Test/baseResults/hlsl.structarray.flatten.frag.out
index 1e3512eb1..d2e311a77 100644
--- a/Test/baseResults/hlsl.structarray.flatten.frag.out
+++ b/Test/baseResults/hlsl.structarray.flatten.frag.out
@@ -155,7 +155,7 @@ gl_FragCoord origin is upper left
 0:?     'g_texdata_array2[2].nonopaque_thing' ( uniform 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 80
 
diff --git a/Test/baseResults/hlsl.structarray.flatten.geom.out b/Test/baseResults/hlsl.structarray.flatten.geom.out
index e298cc7c6..67dcf9952 100644
--- a/Test/baseResults/hlsl.structarray.flatten.geom.out
+++ b/Test/baseResults/hlsl.structarray.flatten.geom.out
@@ -169,7 +169,7 @@ output primitive = triangle_strip
 0:?     'outStream.color' (layout( location=0) out 4-component vector of float)
 0:?     'outStream.uv' (layout( location=1) out 2-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 58
 
diff --git a/Test/baseResults/hlsl.structbuffer.append.fn.frag.out b/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
index 40d6abe30..2e9d98553 100644
--- a/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.append.fn.frag.out
@@ -149,7 +149,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 70
 
diff --git a/Test/baseResults/hlsl.structbuffer.append.frag.out b/Test/baseResults/hlsl.structbuffer.append.frag.out
index 1b24cda8d..7425b259d 100644
--- a/Test/baseResults/hlsl.structbuffer.append.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.append.frag.out
@@ -123,7 +123,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 56
 
diff --git a/Test/baseResults/hlsl.structbuffer.atomics.frag.out b/Test/baseResults/hlsl.structbuffer.atomics.frag.out
index 3e02d64f6..188b79760 100644
--- a/Test/baseResults/hlsl.structbuffer.atomics.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.atomics.frag.out
@@ -473,7 +473,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 87
 
diff --git a/Test/baseResults/hlsl.structbuffer.byte.frag.out b/Test/baseResults/hlsl.structbuffer.byte.frag.out
index 3b4bb2a5e..8994ed418 100644
--- a/Test/baseResults/hlsl.structbuffer.byte.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.byte.frag.out
@@ -323,7 +323,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 114
 
diff --git a/Test/baseResults/hlsl.structbuffer.coherent.frag.out b/Test/baseResults/hlsl.structbuffer.coherent.frag.out
index bb145af28..e0ee89b73 100644
--- a/Test/baseResults/hlsl.structbuffer.coherent.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.coherent.frag.out
@@ -175,7 +175,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 78
 
diff --git a/Test/baseResults/hlsl.structbuffer.floatidx.comp.out b/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
index b1ed41a1a..36674cace 100644
--- a/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
+++ b/Test/baseResults/hlsl.structbuffer.floatidx.comp.out
@@ -179,7 +179,7 @@ local_size = (1, 1, 1)
 0:?     'rwsb' (layout( row_major std430) buffer block{layout( row_major std430) buffer implicitly-sized array of 4-component vector of float @data})
 0:?     'nThreadId' ( in 3-component vector of uint GlobalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 84
 
diff --git a/Test/baseResults/hlsl.structbuffer.fn.frag.out b/Test/baseResults/hlsl.structbuffer.fn.frag.out
index b0fe62914..ab1344a14 100644
--- a/Test/baseResults/hlsl.structbuffer.fn.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.fn.frag.out
@@ -137,7 +137,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 78
 
diff --git a/Test/baseResults/hlsl.structbuffer.fn2.comp.out b/Test/baseResults/hlsl.structbuffer.fn2.comp.out
index f5358a4a8..994ecf155 100644
--- a/Test/baseResults/hlsl.structbuffer.fn2.comp.out
+++ b/Test/baseResults/hlsl.structbuffer.fn2.comp.out
@@ -133,7 +133,7 @@ local_size = (256, 1, 1)
 0:?     'g_output' (layout( binding=1 rg32ui) uniform uimageBuffer)
 0:?     'dispatchId' ( in uint GlobalInvocationID)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 61
 
diff --git a/Test/baseResults/hlsl.structbuffer.frag.out b/Test/baseResults/hlsl.structbuffer.frag.out
index 1f4f66104..dbc78c78d 100644
--- a/Test/baseResults/hlsl.structbuffer.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.frag.out
@@ -187,7 +187,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 96
 
diff --git a/Test/baseResults/hlsl.structbuffer.incdec.frag.out b/Test/baseResults/hlsl.structbuffer.incdec.frag.out
index 8ab6515c9..c00183e31 100644
--- a/Test/baseResults/hlsl.structbuffer.incdec.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.incdec.frag.out
@@ -203,7 +203,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 70
 
diff --git a/Test/baseResults/hlsl.structbuffer.rw.frag.out b/Test/baseResults/hlsl.structbuffer.rw.frag.out
index 12744b166..66043135f 100644
--- a/Test/baseResults/hlsl.structbuffer.rw.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.rw.frag.out
@@ -175,7 +175,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 78
 
diff --git a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
index 8a746a055..a5b85059a 100644
--- a/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
+++ b/Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
@@ -1003,7 +1003,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' (layout( location=0) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 239
 
diff --git a/Test/baseResults/hlsl.structin.vert.out b/Test/baseResults/hlsl.structin.vert.out
index c10088910..e605ed3b5 100755
--- a/Test/baseResults/hlsl.structin.vert.out
+++ b/Test/baseResults/hlsl.structin.vert.out
@@ -339,7 +339,7 @@ Shader version: 500
 0:?     'vi.b' (layout( location=4) in 4-component vector of float)
 0:?     'e' (layout( location=5) in 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 94
 
diff --git a/Test/baseResults/hlsl.subpass.frag.out b/Test/baseResults/hlsl.subpass.frag.out
index c15d7a0f2..6059127ac 100644
--- a/Test/baseResults/hlsl.subpass.frag.out
+++ b/Test/baseResults/hlsl.subpass.frag.out
@@ -429,7 +429,7 @@ gl_FragCoord origin is upper left
 0:?     'subpass_2' ( uniform subpassInput)
 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 204
 
diff --git a/Test/baseResults/hlsl.switch.frag.out b/Test/baseResults/hlsl.switch.frag.out
index 93619d339..b440d4ed1 100755
--- a/Test/baseResults/hlsl.switch.frag.out
+++ b/Test/baseResults/hlsl.switch.frag.out
@@ -295,7 +295,7 @@ gl_FragCoord origin is upper left
 0:?     'c' (layout( location=1) flat in int)
 0:?     'd' (layout( location=2) flat in int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 106
 
diff --git a/Test/baseResults/hlsl.swizzle.frag.out b/Test/baseResults/hlsl.swizzle.frag.out
index c938386f2..9caa7f332 100755
--- a/Test/baseResults/hlsl.swizzle.frag.out
+++ b/Test/baseResults/hlsl.swizzle.frag.out
@@ -76,7 +76,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     'AmbientColor' ( global 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 30
 
diff --git a/Test/baseResults/hlsl.synthesizeInput.frag.out b/Test/baseResults/hlsl.synthesizeInput.frag.out
index 7a5aa8967..2fb0bf1ed 100755
--- a/Test/baseResults/hlsl.synthesizeInput.frag.out
+++ b/Test/baseResults/hlsl.synthesizeInput.frag.out
@@ -97,7 +97,7 @@ gl_FragCoord origin is upper left
 0:?     'input.interp' (layout( location=0) in float)
 0:?     'input.no_interp' (layout( location=1) flat in uint)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 44
 
diff --git a/Test/baseResults/hlsl.target.frag.out b/Test/baseResults/hlsl.target.frag.out
index 1e6b6a21d..e748b984e 100755
--- a/Test/baseResults/hlsl.target.frag.out
+++ b/Test/baseResults/hlsl.target.frag.out
@@ -113,7 +113,7 @@ gl_FragCoord origin is upper left
 0:?     'out1' (layout( location=1) out 4-component vector of float)
 0:?     'out2' (layout( location=3) out 4-component vector of float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 
diff --git a/Test/baseResults/hlsl.targetStruct1.frag.out b/Test/baseResults/hlsl.targetStruct1.frag.out
index 2b0d32469..b6a73a1a6 100755
--- a/Test/baseResults/hlsl.targetStruct1.frag.out
+++ b/Test/baseResults/hlsl.targetStruct1.frag.out
@@ -183,7 +183,7 @@ gl_FragCoord origin is upper left
 0:?     'input.no_interp' (layout( location=1) flat in uint)
 0:?     'po' (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 65
 
diff --git a/Test/baseResults/hlsl.targetStruct2.frag.out b/Test/baseResults/hlsl.targetStruct2.frag.out
index 30a471520..d4bde1f61 100755
--- a/Test/baseResults/hlsl.targetStruct2.frag.out
+++ b/Test/baseResults/hlsl.targetStruct2.frag.out
@@ -183,7 +183,7 @@ gl_FragCoord origin is upper left
 0:?     'input.no_interp' (layout( location=1) flat in uint)
 0:?     'po' (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 65
 
diff --git a/Test/baseResults/hlsl.templatetypes.frag.out b/Test/baseResults/hlsl.templatetypes.frag.out
index 0c4b25e7b..33b734ddd 100644
--- a/Test/baseResults/hlsl.templatetypes.frag.out
+++ b/Test/baseResults/hlsl.templatetypes.frag.out
@@ -507,7 +507,7 @@ gl_FragCoord origin is upper left
 0:?   Linker Objects
 0:?     '@entryPointOutput' (layout( location=0) out float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 153
 
diff --git a/Test/baseResults/hlsl.texture.struct.frag.out b/Test/baseResults/hlsl.texture.struct.frag.out
index 6e0e7ef80..b60bd3afe 100644
--- a/Test/baseResults/hlsl.texture.struct.frag.out
+++ b/Test/baseResults/hlsl.texture.struct.frag.out
@@ -837,7 +837,7 @@ gl_FragCoord origin is upper left
 0:?     'g_tTex2s1a' ( 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 240
 
diff --git a/Test/baseResults/hlsl.texture.subvec4.frag.out b/Test/baseResults/hlsl.texture.subvec4.frag.out
index b372cf7f4..5cb3bad48 100644
--- a/Test/baseResults/hlsl.texture.subvec4.frag.out
+++ b/Test/baseResults/hlsl.texture.subvec4.frag.out
@@ -355,7 +355,7 @@ gl_FragCoord origin is upper left
 0:?     'g_sSamp' ( uniform sampler)
 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 130
 
diff --git a/Test/baseResults/hlsl.texturebuffer.frag.out b/Test/baseResults/hlsl.texturebuffer.frag.out
index fce5ac703..51860a29a 100644
--- a/Test/baseResults/hlsl.texturebuffer.frag.out
+++ b/Test/baseResults/hlsl.texturebuffer.frag.out
@@ -69,7 +69,7 @@ gl_FragCoord origin is upper left
 0:?     '@entryPointOutput' (layout( location=0) out 4-component vector of float)
 0:?     'pos' ( in 4-component vector of float FragCoord)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 
diff --git a/Test/baseResults/hlsl.this.frag.out b/Test/baseResults/hlsl.this.frag.out
index acca30519..7e0318af7 100755
--- a/Test/baseResults/hlsl.this.frag.out
+++ b/Test/baseResults/hlsl.this.frag.out
@@ -239,7 +239,7 @@ gl_FragCoord origin is upper left
 0:?     'var' ( global 2-component vector of float)
 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 98
 
diff --git a/Test/baseResults/hlsl.tx.bracket.frag.out b/Test/baseResults/hlsl.tx.bracket.frag.out
index 9c229cf82..a07f32648 100644
--- a/Test/baseResults/hlsl.tx.bracket.frag.out
+++ b/Test/baseResults/hlsl.tx.bracket.frag.out
@@ -421,7 +421,7 @@ gl_FragCoord origin is upper left
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform int c1,  uniform 2-component vector of int c2,  uniform 3-component vector of int c3,  uniform 4-component vector of int c4,  uniform int o1,  uniform 2-component vector of int o2,  uniform 3-component vector of int o3,  uniform 4-component vector of int o4})
 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 188
 
diff --git a/Test/baseResults/hlsl.tx.overload.frag.out b/Test/baseResults/hlsl.tx.overload.frag.out
index 5c248b1df..79610c952 100644
--- a/Test/baseResults/hlsl.tx.overload.frag.out
+++ b/Test/baseResults/hlsl.tx.overload.frag.out
@@ -133,7 +133,7 @@ gl_FragCoord origin is upper left
 0:?     'twf4' (layout( rgba32f) uniform image2D)
 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 73
 
diff --git a/Test/baseResults/hlsl.type.half.frag.out b/Test/baseResults/hlsl.type.half.frag.out
index 4160d8841..e19b31135 100644
--- a/Test/baseResults/hlsl.type.half.frag.out
+++ b/Test/baseResults/hlsl.type.half.frag.out
@@ -163,7 +163,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 60
 
diff --git a/Test/baseResults/hlsl.type.identifier.frag.out b/Test/baseResults/hlsl.type.identifier.frag.out
index d6c405779..9e7861cce 100644
--- a/Test/baseResults/hlsl.type.identifier.frag.out
+++ b/Test/baseResults/hlsl.type.identifier.frag.out
@@ -265,7 +265,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 109
 
diff --git a/Test/baseResults/hlsl.typeGraphCopy.vert.out b/Test/baseResults/hlsl.typeGraphCopy.vert.out
index 3f45ebeba..81291dc7b 100755
--- a/Test/baseResults/hlsl.typeGraphCopy.vert.out
+++ b/Test/baseResults/hlsl.typeGraphCopy.vert.out
@@ -61,7 +61,7 @@ Shader version: 500
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform structure{ temp structure{ temp structure{ temp int a,  temp float b} s1,  temp structure{ temp int a,  temp float b} s2} t1,  temp structure{ temp int a,  temp float b} t2,  temp structure{ temp structure{ temp int a,  temp float b} s1,  temp structure{ temp int a,  temp float b} s2} t3} foo})
 0:?     '@entryPointOutput' (layout( location=0) out float)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 28
 
diff --git a/Test/baseResults/hlsl.typedef.frag.out b/Test/baseResults/hlsl.typedef.frag.out
index 50de1ef35..0b5dc2876 100755
--- a/Test/baseResults/hlsl.typedef.frag.out
+++ b/Test/baseResults/hlsl.typedef.frag.out
@@ -78,7 +78,7 @@ gl_FragCoord origin is upper left
 0:10                'j' ( temp int)
 0:?   Linker Objects
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 34
 
diff --git a/Test/baseResults/hlsl.void.frag.out b/Test/baseResults/hlsl.void.frag.out
index 40a29bf3f..60c58cb39 100755
--- a/Test/baseResults/hlsl.void.frag.out
+++ b/Test/baseResults/hlsl.void.frag.out
@@ -53,7 +53,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 27
 
diff --git a/Test/baseResults/hlsl.whileLoop.frag.out b/Test/baseResults/hlsl.whileLoop.frag.out
index 03e3d2c74..e4fc0d452 100755
--- a/Test/baseResults/hlsl.whileLoop.frag.out
+++ b/Test/baseResults/hlsl.whileLoop.frag.out
@@ -95,7 +95,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 52
 
diff --git a/Test/baseResults/hlsl.y-negate-1.vert.out b/Test/baseResults/hlsl.y-negate-1.vert.out
index a17be216c..41c647006 100644
--- a/Test/baseResults/hlsl.y-negate-1.vert.out
+++ b/Test/baseResults/hlsl.y-negate-1.vert.out
@@ -71,7 +71,7 @@ Shader version: 500
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float pos})
 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 34
 
diff --git a/Test/baseResults/hlsl.y-negate-2.vert.out b/Test/baseResults/hlsl.y-negate-2.vert.out
index 6f328a6f0..b228e463d 100644
--- a/Test/baseResults/hlsl.y-negate-2.vert.out
+++ b/Test/baseResults/hlsl.y-negate-2.vert.out
@@ -79,7 +79,7 @@ Shader version: 500
 0:?     'anon@0' (layout( row_major std140) uniform block{ uniform 4-component vector of float pos})
 0:?     'position' ( out 4-component vector of float Position)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 37
 
diff --git a/Test/baseResults/hlsl.y-negate-3.vert.out b/Test/baseResults/hlsl.y-negate-3.vert.out
index a9706a67e..4a87232c4 100644
--- a/Test/baseResults/hlsl.y-negate-3.vert.out
+++ b/Test/baseResults/hlsl.y-negate-3.vert.out
@@ -125,7 +125,7 @@ Shader version: 500
 0:?     '@entryPointOutput.pos' ( out 4-component vector of float Position)
 0:?     '@entryPointOutput.somethingelse' (layout( location=0) out int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 
diff --git a/Test/baseResults/remap.basic.dcefunc.frag.out b/Test/baseResults/remap.basic.dcefunc.frag.out
index 2db2baf78..abd8e9824 100644
--- a/Test/baseResults/remap.basic.dcefunc.frag.out
+++ b/Test/baseResults/remap.basic.dcefunc.frag.out
@@ -1,5 +1,5 @@
 remap.basic.dcefunc.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/remap.basic.everything.frag.out b/Test/baseResults/remap.basic.everything.frag.out
index c52345bd5..b5a5ba7e6 100644
--- a/Test/baseResults/remap.basic.everything.frag.out
+++ b/Test/baseResults/remap.basic.everything.frag.out
@@ -1,5 +1,5 @@
 remap.basic.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24969
 
diff --git a/Test/baseResults/remap.basic.none.frag.out b/Test/baseResults/remap.basic.none.frag.out
index dd6bad845..90118b05a 100644
--- a/Test/baseResults/remap.basic.none.frag.out
+++ b/Test/baseResults/remap.basic.none.frag.out
@@ -1,5 +1,5 @@
 remap.basic.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/remap.basic.strip.frag.out b/Test/baseResults/remap.basic.strip.frag.out
index 1f1b59ee3..e3e0b0c77 100644
--- a/Test/baseResults/remap.basic.strip.frag.out
+++ b/Test/baseResults/remap.basic.strip.frag.out
@@ -1,5 +1,5 @@
 remap.basic.strip.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
index 322988e8e..77ed4f351 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out
@@ -1,7 +1,7 @@
 remap.hlsl.sample.basic.everything.frag
 WARNING: 0:4: 'immediate sampler state' : unimplemented 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24878
 
diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
index e2b71aff7..459c19f1f 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out
@@ -1,7 +1,7 @@
 remap.hlsl.sample.basic.none.frag
 WARNING: 0:4: 'immediate sampler state' : unimplemented 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 198
 
diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
index 3e6e6befb..4c9e87ecd 100644
--- a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
+++ b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out
@@ -1,7 +1,7 @@
 remap.hlsl.sample.basic.strip.frag
 WARNING: 0:4: 'immediate sampler state' : unimplemented 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 198
 
diff --git a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out
index 986f407df..e410ccfa5 100644
--- a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out
+++ b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out
@@ -1,5 +1,5 @@
 remap.hlsl.templatetypes.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24954
 
diff --git a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out
index 51b012f0e..ef31f71b4 100644
--- a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out
+++ b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out
@@ -1,5 +1,5 @@
 remap.hlsl.templatetypes.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 160
 
diff --git a/Test/baseResults/remap.if.everything.frag.out b/Test/baseResults/remap.if.everything.frag.out
index d7e2f5a40..c63002dd0 100644
--- a/Test/baseResults/remap.if.everything.frag.out
+++ b/Test/baseResults/remap.if.everything.frag.out
@@ -1,5 +1,5 @@
 remap.if.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22855
 
diff --git a/Test/baseResults/remap.if.none.frag.out b/Test/baseResults/remap.if.none.frag.out
index b0560956d..2bb50b6db 100644
--- a/Test/baseResults/remap.if.none.frag.out
+++ b/Test/baseResults/remap.if.none.frag.out
@@ -1,5 +1,5 @@
 remap.if.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25
 
diff --git a/Test/baseResults/remap.similar_1a.everything.frag.out b/Test/baseResults/remap.similar_1a.everything.frag.out
index 3dde4c259..94e1f86a7 100644
--- a/Test/baseResults/remap.similar_1a.everything.frag.out
+++ b/Test/baseResults/remap.similar_1a.everything.frag.out
@@ -1,5 +1,5 @@
 remap.similar_1a.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24916
 
diff --git a/Test/baseResults/remap.similar_1a.none.frag.out b/Test/baseResults/remap.similar_1a.none.frag.out
index 9c7a1f89b..508b54d0a 100644
--- a/Test/baseResults/remap.similar_1a.none.frag.out
+++ b/Test/baseResults/remap.similar_1a.none.frag.out
@@ -1,5 +1,5 @@
 remap.similar_1a.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 86
 
diff --git a/Test/baseResults/remap.similar_1b.everything.frag.out b/Test/baseResults/remap.similar_1b.everything.frag.out
index 76dbb1a29..4cd16b4e4 100644
--- a/Test/baseResults/remap.similar_1b.everything.frag.out
+++ b/Test/baseResults/remap.similar_1b.everything.frag.out
@@ -1,5 +1,5 @@
 remap.similar_1b.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24916
 
diff --git a/Test/baseResults/remap.similar_1b.none.frag.out b/Test/baseResults/remap.similar_1b.none.frag.out
index feab0f738..e5ad330cf 100644
--- a/Test/baseResults/remap.similar_1b.none.frag.out
+++ b/Test/baseResults/remap.similar_1b.none.frag.out
@@ -1,5 +1,5 @@
 remap.similar_1b.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 91
 
diff --git a/Test/baseResults/remap.specconst.comp.out b/Test/baseResults/remap.specconst.comp.out
index bae62b0c3..3827cb15f 100644
--- a/Test/baseResults/remap.specconst.comp.out
+++ b/Test/baseResults/remap.specconst.comp.out
@@ -1,5 +1,5 @@
 remap.specconst.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 16104
 
diff --git a/Test/baseResults/remap.switch.everything.frag.out b/Test/baseResults/remap.switch.everything.frag.out
index bc604f275..d56bfcebc 100644
--- a/Test/baseResults/remap.switch.everything.frag.out
+++ b/Test/baseResults/remap.switch.everything.frag.out
@@ -2,7 +2,7 @@ remap.switch.everything.frag
 WARNING: 0:5: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
          "precision mediump int; precision highp float;" 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 23990
 
diff --git a/Test/baseResults/remap.switch.none.frag.out b/Test/baseResults/remap.switch.none.frag.out
index 109a4639c..bb42c65f4 100644
--- a/Test/baseResults/remap.switch.none.frag.out
+++ b/Test/baseResults/remap.switch.none.frag.out
@@ -2,7 +2,7 @@ remap.switch.none.frag
 WARNING: 0:5: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
          "precision mediump int; precision highp float;" 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 48
 
diff --git a/Test/baseResults/remap.uniformarray.everything.frag.out b/Test/baseResults/remap.uniformarray.everything.frag.out
index 8cfff583a..521819d8a 100644
--- a/Test/baseResults/remap.uniformarray.everything.frag.out
+++ b/Test/baseResults/remap.uniformarray.everything.frag.out
@@ -1,5 +1,5 @@
 remap.uniformarray.everything.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25030
 
diff --git a/Test/baseResults/remap.uniformarray.none.frag.out b/Test/baseResults/remap.uniformarray.none.frag.out
index f1d98e753..1bc458e89 100644
--- a/Test/baseResults/remap.uniformarray.none.frag.out
+++ b/Test/baseResults/remap.uniformarray.none.frag.out
@@ -1,5 +1,5 @@
 remap.uniformarray.none.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 
diff --git a/Test/baseResults/spv.100ops.frag.out b/Test/baseResults/spv.100ops.frag.out
index 89ecb60e3..f886b43ec 100755
--- a/Test/baseResults/spv.100ops.frag.out
+++ b/Test/baseResults/spv.100ops.frag.out
@@ -1,5 +1,5 @@
 spv.100ops.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 49
 
diff --git a/Test/baseResults/spv.130.frag.out b/Test/baseResults/spv.130.frag.out
index 3cf6c6658..43fa19654 100644
--- a/Test/baseResults/spv.130.frag.out
+++ b/Test/baseResults/spv.130.frag.out
@@ -1,7 +1,7 @@
 spv.130.frag
 WARNING: 0:31: '#extension' : extension is only partially supported: GL_ARB_gpu_shader5
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 205
 
diff --git a/Test/baseResults/spv.140.frag.out b/Test/baseResults/spv.140.frag.out
index 89ec65057..15c69af24 100755
--- a/Test/baseResults/spv.140.frag.out
+++ b/Test/baseResults/spv.140.frag.out
@@ -1,5 +1,5 @@
 spv.140.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 96
 
diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out
index d2600944b..98769f773 100755
--- a/Test/baseResults/spv.150.geom.out
+++ b/Test/baseResults/spv.150.geom.out
@@ -1,5 +1,5 @@
 spv.150.geom
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 71
 
diff --git a/Test/baseResults/spv.150.vert.out b/Test/baseResults/spv.150.vert.out
index cc13387dc..203a99d42 100755
--- a/Test/baseResults/spv.150.vert.out
+++ b/Test/baseResults/spv.150.vert.out
@@ -1,5 +1,5 @@
 spv.150.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 63
 
diff --git a/Test/baseResults/spv.300BuiltIns.vert.out b/Test/baseResults/spv.300BuiltIns.vert.out
index a3dd8fbf4..2f0f269e4 100755
--- a/Test/baseResults/spv.300BuiltIns.vert.out
+++ b/Test/baseResults/spv.300BuiltIns.vert.out
@@ -1,5 +1,5 @@
 spv.300BuiltIns.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 42
 
diff --git a/Test/baseResults/spv.300layout.frag.out b/Test/baseResults/spv.300layout.frag.out
index 9d8bfdf33..79797d718 100755
--- a/Test/baseResults/spv.300layout.frag.out
+++ b/Test/baseResults/spv.300layout.frag.out
@@ -1,5 +1,5 @@
 spv.300layout.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 37
 
diff --git a/Test/baseResults/spv.300layout.vert.out b/Test/baseResults/spv.300layout.vert.out
index cdadaa2f6..4674d8c20 100644
--- a/Test/baseResults/spv.300layout.vert.out
+++ b/Test/baseResults/spv.300layout.vert.out
@@ -1,5 +1,5 @@
 spv.300layout.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 163
 
diff --git a/Test/baseResults/spv.300layoutp.vert.out b/Test/baseResults/spv.300layoutp.vert.out
index ae41bcdd7..1f1ae9fcd 100755
--- a/Test/baseResults/spv.300layoutp.vert.out
+++ b/Test/baseResults/spv.300layoutp.vert.out
@@ -1,5 +1,5 @@
 spv.300layoutp.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 115
 
diff --git a/Test/baseResults/spv.310.bitcast.frag.out b/Test/baseResults/spv.310.bitcast.frag.out
index d94e0eae8..4b34c9fcc 100755
--- a/Test/baseResults/spv.310.bitcast.frag.out
+++ b/Test/baseResults/spv.310.bitcast.frag.out
@@ -1,5 +1,5 @@
 spv.310.bitcast.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 153
 
diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out
index a77b0ee96..5ca40f8d6 100644
--- a/Test/baseResults/spv.310.comp.out
+++ b/Test/baseResults/spv.310.comp.out
@@ -1,5 +1,5 @@
 spv.310.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 71
 
diff --git a/Test/baseResults/spv.330.geom.out b/Test/baseResults/spv.330.geom.out
index c1a7615ae..5b211d094 100644
--- a/Test/baseResults/spv.330.geom.out
+++ b/Test/baseResults/spv.330.geom.out
@@ -1,5 +1,5 @@
 spv.330.geom
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 32
 
diff --git a/Test/baseResults/spv.400.frag.out b/Test/baseResults/spv.400.frag.out
index e1d3da969..3f73f5ba3 100644
--- a/Test/baseResults/spv.400.frag.out
+++ b/Test/baseResults/spv.400.frag.out
@@ -1,5 +1,5 @@
 spv.400.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 1118
 
diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out
index 186874a7c..13c1ed4cb 100644
--- a/Test/baseResults/spv.400.tesc.out
+++ b/Test/baseResults/spv.400.tesc.out
@@ -1,5 +1,5 @@
 spv.400.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 92
 
diff --git a/Test/baseResults/spv.400.tese.out b/Test/baseResults/spv.400.tese.out
index 7b07fb99f..5a0c74595 100755
--- a/Test/baseResults/spv.400.tese.out
+++ b/Test/baseResults/spv.400.tese.out
@@ -1,5 +1,5 @@
 spv.400.tese
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 96
 
diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out
index d0c18a01a..41a842791 100644
--- a/Test/baseResults/spv.420.geom.out
+++ b/Test/baseResults/spv.420.geom.out
@@ -1,5 +1,5 @@
 spv.420.geom
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 72
 
diff --git a/Test/baseResults/spv.430.frag.out b/Test/baseResults/spv.430.frag.out
index d07687a89..97c35e1ae 100755
--- a/Test/baseResults/spv.430.frag.out
+++ b/Test/baseResults/spv.430.frag.out
@@ -1,5 +1,5 @@
 spv.430.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 
diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out
index 66608af60..07f5cd7be 100755
--- a/Test/baseResults/spv.430.vert.out
+++ b/Test/baseResults/spv.430.vert.out
@@ -1,5 +1,5 @@
 spv.430.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 66
 
diff --git a/Test/baseResults/spv.450.geom.out b/Test/baseResults/spv.450.geom.out
index e4089b2a3..e3b58e717 100755
--- a/Test/baseResults/spv.450.geom.out
+++ b/Test/baseResults/spv.450.geom.out
@@ -1,5 +1,5 @@
 spv.450.geom
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 31
 
diff --git a/Test/baseResults/spv.450.noRedecl.tesc.out b/Test/baseResults/spv.450.noRedecl.tesc.out
index 754852831..20a65929d 100755
--- a/Test/baseResults/spv.450.noRedecl.tesc.out
+++ b/Test/baseResults/spv.450.noRedecl.tesc.out
@@ -1,5 +1,5 @@
 spv.450.noRedecl.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 21
 
diff --git a/Test/baseResults/spv.450.tesc.out b/Test/baseResults/spv.450.tesc.out
index ad7cad5a5..a93b9cbd6 100755
--- a/Test/baseResults/spv.450.tesc.out
+++ b/Test/baseResults/spv.450.tesc.out
@@ -1,5 +1,5 @@
 spv.450.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 45
 
diff --git a/Test/baseResults/spv.460.comp.out b/Test/baseResults/spv.460.comp.out
index aa46cc9ed..be5148d51 100755
--- a/Test/baseResults/spv.460.comp.out
+++ b/Test/baseResults/spv.460.comp.out
@@ -1,5 +1,5 @@
 spv.460.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 15
 
diff --git a/Test/baseResults/spv.460.frag.out b/Test/baseResults/spv.460.frag.out
index 0df9a5a02..c05676f16 100755
--- a/Test/baseResults/spv.460.frag.out
+++ b/Test/baseResults/spv.460.frag.out
@@ -1,5 +1,5 @@
 spv.460.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 32
 
diff --git a/Test/baseResults/spv.460.vert.out b/Test/baseResults/spv.460.vert.out
index 1f0b74f0f..4feb15b98 100755
--- a/Test/baseResults/spv.460.vert.out
+++ b/Test/baseResults/spv.460.vert.out
@@ -1,5 +1,5 @@
 spv.460.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 
diff --git a/Test/baseResults/spv.AofA.frag.out b/Test/baseResults/spv.AofA.frag.out
index 0c4d49591..f44466c58 100644
--- a/Test/baseResults/spv.AofA.frag.out
+++ b/Test/baseResults/spv.AofA.frag.out
@@ -1,5 +1,5 @@
 spv.AofA.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 104
 
diff --git a/Test/baseResults/spv.GeometryShaderPassthrough.geom.out b/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
index 4f5cbdb34..0ddc91068 100644
--- a/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
+++ b/Test/baseResults/spv.GeometryShaderPassthrough.geom.out
@@ -1,5 +1,5 @@
 spv.GeometryShaderPassthrough.geom
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 15
 
diff --git a/Test/baseResults/spv.OVR_multiview.vert.out b/Test/baseResults/spv.OVR_multiview.vert.out
index 3ea1b1889..17d385931 100644
--- a/Test/baseResults/spv.OVR_multiview.vert.out
+++ b/Test/baseResults/spv.OVR_multiview.vert.out
@@ -1,5 +1,5 @@
 spv.OVR_multiview.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 
diff --git a/Test/baseResults/spv.Operations.frag.out b/Test/baseResults/spv.Operations.frag.out
index 07563b3f1..9b3f09ee5 100755
--- a/Test/baseResults/spv.Operations.frag.out
+++ b/Test/baseResults/spv.Operations.frag.out
@@ -1,5 +1,5 @@
 spv.Operations.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 532
 
diff --git a/Test/baseResults/spv.accessChain.frag.out b/Test/baseResults/spv.accessChain.frag.out
index 4711997a1..2f4bf3aaf 100755
--- a/Test/baseResults/spv.accessChain.frag.out
+++ b/Test/baseResults/spv.accessChain.frag.out
@@ -1,5 +1,5 @@
 spv.accessChain.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 206
 
diff --git a/Test/baseResults/spv.aggOps.frag.out b/Test/baseResults/spv.aggOps.frag.out
index 3ac65d4ba..d7142c3e8 100644
--- a/Test/baseResults/spv.aggOps.frag.out
+++ b/Test/baseResults/spv.aggOps.frag.out
@@ -2,7 +2,7 @@ spv.aggOps.frag
 WARNING: 0:4: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
          "precision mediump int; precision highp float;" 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 215
 
diff --git a/Test/baseResults/spv.always-discard.frag.out b/Test/baseResults/spv.always-discard.frag.out
index bc5249ef0..349748f43 100644
--- a/Test/baseResults/spv.always-discard.frag.out
+++ b/Test/baseResults/spv.always-discard.frag.out
@@ -1,5 +1,5 @@
 spv.always-discard.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 84
 
diff --git a/Test/baseResults/spv.always-discard2.frag.out b/Test/baseResults/spv.always-discard2.frag.out
index f77bdff07..d1aff7e59 100755
--- a/Test/baseResults/spv.always-discard2.frag.out
+++ b/Test/baseResults/spv.always-discard2.frag.out
@@ -1,5 +1,5 @@
 spv.always-discard2.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 40
 
diff --git a/Test/baseResults/spv.arbPostDepthCoverage.frag.out b/Test/baseResults/spv.arbPostDepthCoverage.frag.out
index 7af795144..dd7a370ba 100644
--- a/Test/baseResults/spv.arbPostDepthCoverage.frag.out
+++ b/Test/baseResults/spv.arbPostDepthCoverage.frag.out
@@ -1,5 +1,5 @@
 spv.arbPostDepthCoverage.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 18
 
diff --git a/Test/baseResults/spv.atomic.comp.out b/Test/baseResults/spv.atomic.comp.out
index 85bf2fe99..5df873d25 100755
--- a/Test/baseResults/spv.atomic.comp.out
+++ b/Test/baseResults/spv.atomic.comp.out
@@ -1,5 +1,5 @@
 spv.atomic.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 74
 
diff --git a/Test/baseResults/spv.atomicInt64.comp.out b/Test/baseResults/spv.atomicInt64.comp.out
index 8a5b543c0..8daee95ce 100644
--- a/Test/baseResults/spv.atomicInt64.comp.out
+++ b/Test/baseResults/spv.atomicInt64.comp.out
@@ -1,5 +1,5 @@
 spv.atomicInt64.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 149
 
diff --git a/Test/baseResults/spv.barrier.vert.out b/Test/baseResults/spv.barrier.vert.out
index d6df623ca..5157f8876 100755
--- a/Test/baseResults/spv.barrier.vert.out
+++ b/Test/baseResults/spv.barrier.vert.out
@@ -1,5 +1,5 @@
 spv.barrier.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 
diff --git a/Test/baseResults/spv.bitCast.frag.out b/Test/baseResults/spv.bitCast.frag.out
index 95f465874..e16274507 100644
--- a/Test/baseResults/spv.bitCast.frag.out
+++ b/Test/baseResults/spv.bitCast.frag.out
@@ -1,5 +1,5 @@
 spv.bitCast.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 172
 
diff --git a/Test/baseResults/spv.bool.vert.out b/Test/baseResults/spv.bool.vert.out
index fe26ba5db..a8c86034e 100644
--- a/Test/baseResults/spv.bool.vert.out
+++ b/Test/baseResults/spv.bool.vert.out
@@ -1,5 +1,5 @@
 spv.bool.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 46
 
diff --git a/Test/baseResults/spv.boolInBlock.frag.out b/Test/baseResults/spv.boolInBlock.frag.out
index 97902791d..e099c7293 100644
--- a/Test/baseResults/spv.boolInBlock.frag.out
+++ b/Test/baseResults/spv.boolInBlock.frag.out
@@ -1,5 +1,5 @@
 spv.boolInBlock.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 107
 
diff --git a/Test/baseResults/spv.branch-return.vert.out b/Test/baseResults/spv.branch-return.vert.out
index c0772560a..96e07c80c 100644
--- a/Test/baseResults/spv.branch-return.vert.out
+++ b/Test/baseResults/spv.branch-return.vert.out
@@ -1,5 +1,5 @@
 spv.branch-return.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 38
 
diff --git a/Test/baseResults/spv.buffer.autoassign.frag.out b/Test/baseResults/spv.buffer.autoassign.frag.out
index c6ef734f4..fe6af8244 100644
--- a/Test/baseResults/spv.buffer.autoassign.frag.out
+++ b/Test/baseResults/spv.buffer.autoassign.frag.out
@@ -1,5 +1,5 @@
 spv.buffer.autoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 
diff --git a/Test/baseResults/spv.builtInXFB.vert.out b/Test/baseResults/spv.builtInXFB.vert.out
index ef8f8d258..a1acfc4da 100755
--- a/Test/baseResults/spv.builtInXFB.vert.out
+++ b/Test/baseResults/spv.builtInXFB.vert.out
@@ -1,5 +1,5 @@
 spv.builtInXFB.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 21
 
diff --git a/Test/baseResults/spv.conditionalDiscard.frag.out b/Test/baseResults/spv.conditionalDiscard.frag.out
index 8f44ceb7d..01c993246 100755
--- a/Test/baseResults/spv.conditionalDiscard.frag.out
+++ b/Test/baseResults/spv.conditionalDiscard.frag.out
@@ -1,5 +1,5 @@
 spv.conditionalDiscard.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 36
 
diff --git a/Test/baseResults/spv.conversion.frag.out b/Test/baseResults/spv.conversion.frag.out
index 41b4f77ce..87956dbf4 100755
--- a/Test/baseResults/spv.conversion.frag.out
+++ b/Test/baseResults/spv.conversion.frag.out
@@ -1,5 +1,5 @@
 spv.conversion.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 455
 
diff --git a/Test/baseResults/spv.dataOut.frag.out b/Test/baseResults/spv.dataOut.frag.out
index b59f9193f..e559c5d82 100755
--- a/Test/baseResults/spv.dataOut.frag.out
+++ b/Test/baseResults/spv.dataOut.frag.out
@@ -1,5 +1,5 @@
 spv.dataOut.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 
diff --git a/Test/baseResults/spv.dataOutIndirect.frag.out b/Test/baseResults/spv.dataOutIndirect.frag.out
index 5029c73c6..d532dbc2d 100755
--- a/Test/baseResults/spv.dataOutIndirect.frag.out
+++ b/Test/baseResults/spv.dataOutIndirect.frag.out
@@ -1,5 +1,5 @@
 spv.dataOutIndirect.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 26
 
diff --git a/Test/baseResults/spv.dataOutIndirect.vert.out b/Test/baseResults/spv.dataOutIndirect.vert.out
index ed1e706c5..7fe82c137 100755
--- a/Test/baseResults/spv.dataOutIndirect.vert.out
+++ b/Test/baseResults/spv.dataOutIndirect.vert.out
@@ -1,7 +1,7 @@
 spv.dataOutIndirect.vert
 WARNING: 0:3: attribute deprecated in version 130; may be removed in future release
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 38
 
diff --git a/Test/baseResults/spv.debugInfo.frag.out b/Test/baseResults/spv.debugInfo.frag.out
index 8f63ec3fe..bc62354d0 100644
--- a/Test/baseResults/spv.debugInfo.frag.out
+++ b/Test/baseResults/spv.debugInfo.frag.out
@@ -1,5 +1,5 @@
 spv.debugInfo.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 126
 
diff --git a/Test/baseResults/spv.deepRvalue.frag.out b/Test/baseResults/spv.deepRvalue.frag.out
index 41e2cf502..ea63b1787 100644
--- a/Test/baseResults/spv.deepRvalue.frag.out
+++ b/Test/baseResults/spv.deepRvalue.frag.out
@@ -1,5 +1,5 @@
 spv.deepRvalue.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 152
 
diff --git a/Test/baseResults/spv.depthOut.frag.out b/Test/baseResults/spv.depthOut.frag.out
index 988874b72..f195d1d7e 100755
--- a/Test/baseResults/spv.depthOut.frag.out
+++ b/Test/baseResults/spv.depthOut.frag.out
@@ -1,5 +1,5 @@
 spv.depthOut.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 15
 
diff --git a/Test/baseResults/spv.deviceGroup.frag.out b/Test/baseResults/spv.deviceGroup.frag.out
index 3be8a8efe..ceab9d43f 100755
--- a/Test/baseResults/spv.deviceGroup.frag.out
+++ b/Test/baseResults/spv.deviceGroup.frag.out
@@ -1,5 +1,5 @@
 spv.deviceGroup.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 17
 
diff --git a/Test/baseResults/spv.discard-dce.frag.out b/Test/baseResults/spv.discard-dce.frag.out
index 65058937e..be04de521 100755
--- a/Test/baseResults/spv.discard-dce.frag.out
+++ b/Test/baseResults/spv.discard-dce.frag.out
@@ -1,5 +1,5 @@
 spv.discard-dce.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 84
 
diff --git a/Test/baseResults/spv.do-simple.vert.out b/Test/baseResults/spv.do-simple.vert.out
index ca48d91e5..5bad7fd7e 100755
--- a/Test/baseResults/spv.do-simple.vert.out
+++ b/Test/baseResults/spv.do-simple.vert.out
@@ -1,5 +1,5 @@
 spv.do-simple.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 21
 
diff --git a/Test/baseResults/spv.do-while-continue-break.vert.out b/Test/baseResults/spv.do-while-continue-break.vert.out
index 01550b537..ec1613479 100644
--- a/Test/baseResults/spv.do-while-continue-break.vert.out
+++ b/Test/baseResults/spv.do-while-continue-break.vert.out
@@ -1,5 +1,5 @@
 spv.do-while-continue-break.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 43
 
diff --git a/Test/baseResults/spv.doWhileLoop.frag.out b/Test/baseResults/spv.doWhileLoop.frag.out
index 4f448033d..e365dbd5c 100755
--- a/Test/baseResults/spv.doWhileLoop.frag.out
+++ b/Test/baseResults/spv.doWhileLoop.frag.out
@@ -1,5 +1,5 @@
 spv.doWhileLoop.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 34
 
diff --git a/Test/baseResults/spv.double.comp.out b/Test/baseResults/spv.double.comp.out
index 09ee6bb1a..1ba0599b1 100755
--- a/Test/baseResults/spv.double.comp.out
+++ b/Test/baseResults/spv.double.comp.out
@@ -1,5 +1,5 @@
 spv.double.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 60
 
diff --git a/Test/baseResults/spv.drawParams.vert.out b/Test/baseResults/spv.drawParams.vert.out
index b1a12a90a..c3f41b8b8 100755
--- a/Test/baseResults/spv.drawParams.vert.out
+++ b/Test/baseResults/spv.drawParams.vert.out
@@ -1,5 +1,5 @@
 spv.drawParams.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 29
 
diff --git a/Test/baseResults/spv.earlyReturnDiscard.frag.out b/Test/baseResults/spv.earlyReturnDiscard.frag.out
index a1f439939..9f2f93fdd 100755
--- a/Test/baseResults/spv.earlyReturnDiscard.frag.out
+++ b/Test/baseResults/spv.earlyReturnDiscard.frag.out
@@ -1,5 +1,5 @@
 spv.earlyReturnDiscard.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 110
 
diff --git a/Test/baseResults/spv.extPostDepthCoverage.frag.out b/Test/baseResults/spv.extPostDepthCoverage.frag.out
index 06e1bea59..1b65772af 100644
--- a/Test/baseResults/spv.extPostDepthCoverage.frag.out
+++ b/Test/baseResults/spv.extPostDepthCoverage.frag.out
@@ -1,5 +1,5 @@
 spv.extPostDepthCoverage.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 6
 
diff --git a/Test/baseResults/spv.float16.frag.out b/Test/baseResults/spv.float16.frag.out
index cffd14b01..e89d82389 100644
--- a/Test/baseResults/spv.float16.frag.out
+++ b/Test/baseResults/spv.float16.frag.out
@@ -1,5 +1,5 @@
 spv.float16.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 534
 
diff --git a/Test/baseResults/spv.flowControl.frag.out b/Test/baseResults/spv.flowControl.frag.out
index 5bb76a986..c3c3ffc65 100755
--- a/Test/baseResults/spv.flowControl.frag.out
+++ b/Test/baseResults/spv.flowControl.frag.out
@@ -1,5 +1,5 @@
 spv.flowControl.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 
diff --git a/Test/baseResults/spv.for-complex-condition.vert.out b/Test/baseResults/spv.for-complex-condition.vert.out
index 0c6b73bbe..ff52d19be 100644
--- a/Test/baseResults/spv.for-complex-condition.vert.out
+++ b/Test/baseResults/spv.for-complex-condition.vert.out
@@ -1,5 +1,5 @@
 spv.for-complex-condition.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 31
 
diff --git a/Test/baseResults/spv.for-continue-break.vert.out b/Test/baseResults/spv.for-continue-break.vert.out
index d5ad7084b..928281537 100644
--- a/Test/baseResults/spv.for-continue-break.vert.out
+++ b/Test/baseResults/spv.for-continue-break.vert.out
@@ -1,5 +1,5 @@
 spv.for-continue-break.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 45
 
diff --git a/Test/baseResults/spv.for-nobody.vert.out b/Test/baseResults/spv.for-nobody.vert.out
index 7804cd408..99f915066 100644
--- a/Test/baseResults/spv.for-nobody.vert.out
+++ b/Test/baseResults/spv.for-nobody.vert.out
@@ -1,5 +1,5 @@
 spv.for-nobody.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25
 
diff --git a/Test/baseResults/spv.for-notest.vert.out b/Test/baseResults/spv.for-notest.vert.out
index da2b2b4f0..c6c8d69c7 100644
--- a/Test/baseResults/spv.for-notest.vert.out
+++ b/Test/baseResults/spv.for-notest.vert.out
@@ -1,5 +1,5 @@
 spv.for-notest.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 
diff --git a/Test/baseResults/spv.for-simple.vert.out b/Test/baseResults/spv.for-simple.vert.out
index 3ac03f551..2de4e78f9 100755
--- a/Test/baseResults/spv.for-simple.vert.out
+++ b/Test/baseResults/spv.for-simple.vert.out
@@ -1,5 +1,5 @@
 spv.for-simple.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 
diff --git a/Test/baseResults/spv.forLoop.frag.out b/Test/baseResults/spv.forLoop.frag.out
index 9479e6022..a52d7260e 100755
--- a/Test/baseResults/spv.forLoop.frag.out
+++ b/Test/baseResults/spv.forLoop.frag.out
@@ -1,5 +1,5 @@
 spv.forLoop.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 131
 
diff --git a/Test/baseResults/spv.forwardFun.frag.out b/Test/baseResults/spv.forwardFun.frag.out
index de644205e..2a8948db8 100755
--- a/Test/baseResults/spv.forwardFun.frag.out
+++ b/Test/baseResults/spv.forwardFun.frag.out
@@ -1,5 +1,5 @@
 spv.forwardFun.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 60
 
diff --git a/Test/baseResults/spv.fullyCovered.frag.out b/Test/baseResults/spv.fullyCovered.frag.out
index 3e25fc82a..aa3529a2e 100644
--- a/Test/baseResults/spv.fullyCovered.frag.out
+++ b/Test/baseResults/spv.fullyCovered.frag.out
@@ -1,5 +1,5 @@
 spv.fullyCovered.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 18
 
diff --git a/Test/baseResults/spv.functionCall.frag.out b/Test/baseResults/spv.functionCall.frag.out
index 5947a9d3f..a5c58dabc 100755
--- a/Test/baseResults/spv.functionCall.frag.out
+++ b/Test/baseResults/spv.functionCall.frag.out
@@ -3,7 +3,7 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
 WARNING: 0:4: varying deprecated in version 130; may be removed in future release
 WARNING: 0:5: varying deprecated in version 130; may be removed in future release
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 76
 
diff --git a/Test/baseResults/spv.functionNestedOpaque.vert.out b/Test/baseResults/spv.functionNestedOpaque.vert.out
index 47cf87947..e6a45e3cf 100644
--- a/Test/baseResults/spv.functionNestedOpaque.vert.out
+++ b/Test/baseResults/spv.functionNestedOpaque.vert.out
@@ -1,5 +1,5 @@
 spv.functionNestedOpaque.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 
diff --git a/Test/baseResults/spv.functionSemantics.frag.out b/Test/baseResults/spv.functionSemantics.frag.out
index b2411e592..402a66692 100755
--- a/Test/baseResults/spv.functionSemantics.frag.out
+++ b/Test/baseResults/spv.functionSemantics.frag.out
@@ -1,5 +1,5 @@
 spv.functionSemantics.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 156
 
diff --git a/Test/baseResults/spv.glFragColor.frag.out b/Test/baseResults/spv.glFragColor.frag.out
index 856a18b02..4e890563f 100755
--- a/Test/baseResults/spv.glFragColor.frag.out
+++ b/Test/baseResults/spv.glFragColor.frag.out
@@ -1,5 +1,5 @@
 spv.glFragColor.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 12
 
diff --git a/Test/baseResults/spv.glsl.register.autoassign.frag.out b/Test/baseResults/spv.glsl.register.autoassign.frag.out
index eb6ec76f1..bb72deed5 100644
--- a/Test/baseResults/spv.glsl.register.autoassign.frag.out
+++ b/Test/baseResults/spv.glsl.register.autoassign.frag.out
@@ -1,5 +1,5 @@
 spv.glsl.register.autoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 142
 
diff --git a/Test/baseResults/spv.glsl.register.noautoassign.frag.out b/Test/baseResults/spv.glsl.register.noautoassign.frag.out
index 4e245a1da..d145b7bcb 100644
--- a/Test/baseResults/spv.glsl.register.noautoassign.frag.out
+++ b/Test/baseResults/spv.glsl.register.noautoassign.frag.out
@@ -1,5 +1,5 @@
 spv.glsl.register.noautoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 142
 
diff --git a/Test/baseResults/spv.hlslDebugInfo.frag.out b/Test/baseResults/spv.hlslDebugInfo.frag.out
index b99849dde..71355ea6e 100644
--- a/Test/baseResults/spv.hlslDebugInfo.frag.out
+++ b/Test/baseResults/spv.hlslDebugInfo.frag.out
@@ -1,5 +1,5 @@
 spv.hlslDebugInfo.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 19
 
diff --git a/Test/baseResults/spv.hlslOffsets.vert.out b/Test/baseResults/spv.hlslOffsets.vert.out
index 1f27966b1..947289398 100644
--- a/Test/baseResults/spv.hlslOffsets.vert.out
+++ b/Test/baseResults/spv.hlslOffsets.vert.out
@@ -17,7 +17,7 @@ Shader version: 450
 0:?   Linker Objects
 0:?     'anon@0' (layout( column_major std430) buffer block{layout( column_major std430) buffer highp float m0, layout( column_major std430) buffer highp 3-component vector of float m4, layout( column_major std430) buffer highp float m16, layout( column_major std430 offset=20) buffer highp 3-component vector of float m20, layout( column_major std430) buffer highp 3-component vector of float m32, layout( column_major std430) buffer highp 2-component vector of float m48, layout( column_major std430) buffer highp 2-component vector of float m56, layout( column_major std430) buffer highp float m64, layout( column_major std430) buffer highp 2-component vector of float m68, layout( column_major std430) buffer highp float m76, layout( column_major std430) buffer highp float m80, layout( column_major std430 offset=88) buffer highp 2-component vector of float m88, layout( column_major std430) buffer highp 2-component vector of float m96, layout( column_major std430) buffer 2-component vector of double m112})
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 14
 
diff --git a/Test/baseResults/spv.image.frag.out b/Test/baseResults/spv.image.frag.out
index 09e5295ea..668bbbe6b 100644
--- a/Test/baseResults/spv.image.frag.out
+++ b/Test/baseResults/spv.image.frag.out
@@ -1,5 +1,5 @@
 spv.image.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 376
 
diff --git a/Test/baseResults/spv.imageLoadStoreLod.frag.out b/Test/baseResults/spv.imageLoadStoreLod.frag.out
index f09904358..7f40d2069 100644
--- a/Test/baseResults/spv.imageLoadStoreLod.frag.out
+++ b/Test/baseResults/spv.imageLoadStoreLod.frag.out
@@ -1,5 +1,5 @@
 spv.imageLoadStoreLod.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 82
 
diff --git a/Test/baseResults/spv.int16.frag.out b/Test/baseResults/spv.int16.frag.out
index 7f6bfb5a3..c0e0ee54c 100644
--- a/Test/baseResults/spv.int16.frag.out
+++ b/Test/baseResults/spv.int16.frag.out
@@ -1,5 +1,5 @@
 spv.int16.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 561
 
diff --git a/Test/baseResults/spv.int64.frag.out b/Test/baseResults/spv.int64.frag.out
index 25befe396..4353efe1c 100644
--- a/Test/baseResults/spv.int64.frag.out
+++ b/Test/baseResults/spv.int64.frag.out
@@ -1,5 +1,5 @@
 spv.int64.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 480
 
diff --git a/Test/baseResults/spv.intOps.vert.out b/Test/baseResults/spv.intOps.vert.out
index c586e2854..bd3db526d 100644
--- a/Test/baseResults/spv.intOps.vert.out
+++ b/Test/baseResults/spv.intOps.vert.out
@@ -1,5 +1,5 @@
 spv.intOps.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 268
 
diff --git a/Test/baseResults/spv.interpOps.frag.out b/Test/baseResults/spv.interpOps.frag.out
index 98986eb49..fa693d23b 100644
--- a/Test/baseResults/spv.interpOps.frag.out
+++ b/Test/baseResults/spv.interpOps.frag.out
@@ -1,5 +1,5 @@
 spv.interpOps.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 100
 
diff --git a/Test/baseResults/spv.layoutNested.vert.out b/Test/baseResults/spv.layoutNested.vert.out
index a88c809f4..f989d1b9c 100644
--- a/Test/baseResults/spv.layoutNested.vert.out
+++ b/Test/baseResults/spv.layoutNested.vert.out
@@ -1,5 +1,5 @@
 spv.layoutNested.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 66
 
diff --git a/Test/baseResults/spv.length.frag.out b/Test/baseResults/spv.length.frag.out
index 22424e171..0eaba5d1c 100755
--- a/Test/baseResults/spv.length.frag.out
+++ b/Test/baseResults/spv.length.frag.out
@@ -1,5 +1,5 @@
 spv.length.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 33
 
diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out
index f08a8a668..3b459957f 100755
--- a/Test/baseResults/spv.localAggregates.frag.out
+++ b/Test/baseResults/spv.localAggregates.frag.out
@@ -1,5 +1,5 @@
 spv.localAggregates.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 136
 
diff --git a/Test/baseResults/spv.loops.frag.out b/Test/baseResults/spv.loops.frag.out
index 901ce3bf9..225cf3b34 100755
--- a/Test/baseResults/spv.loops.frag.out
+++ b/Test/baseResults/spv.loops.frag.out
@@ -1,5 +1,5 @@
 spv.loops.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 725
 
diff --git a/Test/baseResults/spv.loopsArtificial.frag.out b/Test/baseResults/spv.loopsArtificial.frag.out
index d78f6823c..286962226 100755
--- a/Test/baseResults/spv.loopsArtificial.frag.out
+++ b/Test/baseResults/spv.loopsArtificial.frag.out
@@ -1,5 +1,5 @@
 spv.loopsArtificial.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 158
 
diff --git a/Test/baseResults/spv.matFun.vert.out b/Test/baseResults/spv.matFun.vert.out
index a06b54fea..7c9db1b91 100755
--- a/Test/baseResults/spv.matFun.vert.out
+++ b/Test/baseResults/spv.matFun.vert.out
@@ -1,5 +1,5 @@
 spv.matFun.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 103
 
diff --git a/Test/baseResults/spv.matrix.frag.out b/Test/baseResults/spv.matrix.frag.out
index ea2fdec74..27800a59a 100644
--- a/Test/baseResults/spv.matrix.frag.out
+++ b/Test/baseResults/spv.matrix.frag.out
@@ -1,5 +1,5 @@
 spv.matrix.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 286
 
diff --git a/Test/baseResults/spv.matrix2.frag.out b/Test/baseResults/spv.matrix2.frag.out
index e5d5667e3..b5259990d 100644
--- a/Test/baseResults/spv.matrix2.frag.out
+++ b/Test/baseResults/spv.matrix2.frag.out
@@ -1,5 +1,5 @@
 spv.matrix2.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 221
 
diff --git a/Test/baseResults/spv.memoryQualifier.frag.out b/Test/baseResults/spv.memoryQualifier.frag.out
index 7ec5fd56a..a8d64c70a 100644
--- a/Test/baseResults/spv.memoryQualifier.frag.out
+++ b/Test/baseResults/spv.memoryQualifier.frag.out
@@ -1,5 +1,5 @@
 spv.memoryQualifier.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 97
 
diff --git a/Test/baseResults/spv.merge-unreachable.frag.out b/Test/baseResults/spv.merge-unreachable.frag.out
index 7e1334fa2..9d7e6dd7d 100644
--- a/Test/baseResults/spv.merge-unreachable.frag.out
+++ b/Test/baseResults/spv.merge-unreachable.frag.out
@@ -1,5 +1,5 @@
 spv.merge-unreachable.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25
 
diff --git a/Test/baseResults/spv.multiStruct.comp.out b/Test/baseResults/spv.multiStruct.comp.out
index 4d589c5d7..738691c53 100755
--- a/Test/baseResults/spv.multiStruct.comp.out
+++ b/Test/baseResults/spv.multiStruct.comp.out
@@ -1,5 +1,5 @@
 spv.multiStruct.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 161
 
diff --git a/Test/baseResults/spv.multiStructFuncall.frag.out b/Test/baseResults/spv.multiStructFuncall.frag.out
index 8204301c4..80d3408d1 100755
--- a/Test/baseResults/spv.multiStructFuncall.frag.out
+++ b/Test/baseResults/spv.multiStructFuncall.frag.out
@@ -1,5 +1,5 @@
 spv.multiStructFuncall.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 63
 
diff --git a/Test/baseResults/spv.multiView.frag.out b/Test/baseResults/spv.multiView.frag.out
index 87ddd1bc4..73e922b40 100755
--- a/Test/baseResults/spv.multiView.frag.out
+++ b/Test/baseResults/spv.multiView.frag.out
@@ -1,5 +1,5 @@
 spv.multiView.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 17
 
diff --git a/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out b/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
index e77aed6d1..7c0b3b869 100644
--- a/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
+++ b/Test/baseResults/spv.multiviewPerViewAttributes.tesc.out
@@ -1,5 +1,5 @@
 spv.multiviewPerViewAttributes.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 37
 
diff --git a/Test/baseResults/spv.multiviewPerViewAttributes.vert.out b/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
index 5ef344205..e4cab44b8 100644
--- a/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
+++ b/Test/baseResults/spv.multiviewPerViewAttributes.vert.out
@@ -1,5 +1,5 @@
 spv.multiviewPerViewAttributes.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 29
 
diff --git a/Test/baseResults/spv.newTexture.frag.out b/Test/baseResults/spv.newTexture.frag.out
index 3d26b04aa..048370a43 100755
--- a/Test/baseResults/spv.newTexture.frag.out
+++ b/Test/baseResults/spv.newTexture.frag.out
@@ -1,5 +1,5 @@
 spv.newTexture.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 284
 
diff --git a/Test/baseResults/spv.noBuiltInLoc.vert.out b/Test/baseResults/spv.noBuiltInLoc.vert.out
index d5327a56e..928780e86 100644
--- a/Test/baseResults/spv.noBuiltInLoc.vert.out
+++ b/Test/baseResults/spv.noBuiltInLoc.vert.out
@@ -1,5 +1,5 @@
 spv.noBuiltInLoc.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 33
 
diff --git a/Test/baseResults/spv.noDeadDecorations.vert.out b/Test/baseResults/spv.noDeadDecorations.vert.out
index ef9963db0..9db41093e 100644
--- a/Test/baseResults/spv.noDeadDecorations.vert.out
+++ b/Test/baseResults/spv.noDeadDecorations.vert.out
@@ -1,5 +1,5 @@
 spv.noDeadDecorations.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 32
 
diff --git a/Test/baseResults/spv.noWorkgroup.comp.out b/Test/baseResults/spv.noWorkgroup.comp.out
index 4e5cada59..e34a6b5f0 100755
--- a/Test/baseResults/spv.noWorkgroup.comp.out
+++ b/Test/baseResults/spv.noWorkgroup.comp.out
@@ -1,5 +1,5 @@
 spv.noWorkgroup.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 12
 
diff --git a/Test/baseResults/spv.nonSquare.vert.out b/Test/baseResults/spv.nonSquare.vert.out
index c84fbf129..4c335eeb3 100755
--- a/Test/baseResults/spv.nonSquare.vert.out
+++ b/Test/baseResults/spv.nonSquare.vert.out
@@ -1,5 +1,5 @@
 spv.nonSquare.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 90
 
diff --git a/Test/baseResults/spv.offsets.frag.out b/Test/baseResults/spv.offsets.frag.out
index e60027f22..8fd894f16 100755
--- a/Test/baseResults/spv.offsets.frag.out
+++ b/Test/baseResults/spv.offsets.frag.out
@@ -1,5 +1,5 @@
 spv.offsets.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 15
 
diff --git a/Test/baseResults/spv.paramMemory.frag.out b/Test/baseResults/spv.paramMemory.frag.out
index bd8e8d4ae..927d56ace 100755
--- a/Test/baseResults/spv.paramMemory.frag.out
+++ b/Test/baseResults/spv.paramMemory.frag.out
@@ -1,5 +1,5 @@
 spv.paramMemory.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 69
 
diff --git a/Test/baseResults/spv.precise.tesc.out b/Test/baseResults/spv.precise.tesc.out
index 18d28d9b4..bd1bf928c 100644
--- a/Test/baseResults/spv.precise.tesc.out
+++ b/Test/baseResults/spv.precise.tesc.out
@@ -1,5 +1,5 @@
 spv.precise.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 72
 
diff --git a/Test/baseResults/spv.precise.tese.out b/Test/baseResults/spv.precise.tese.out
index abc9badf7..ffdbc8922 100644
--- a/Test/baseResults/spv.precise.tese.out
+++ b/Test/baseResults/spv.precise.tese.out
@@ -1,5 +1,5 @@
 spv.precise.tese
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 119
 
diff --git a/Test/baseResults/spv.precision.frag.out b/Test/baseResults/spv.precision.frag.out
index 1ddfb800f..710c6395f 100755
--- a/Test/baseResults/spv.precision.frag.out
+++ b/Test/baseResults/spv.precision.frag.out
@@ -1,5 +1,5 @@
 spv.precision.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 127
 
diff --git a/Test/baseResults/spv.precisionNonESSamp.frag.out b/Test/baseResults/spv.precisionNonESSamp.frag.out
index c20770c74..e4235bd61 100755
--- a/Test/baseResults/spv.precisionNonESSamp.frag.out
+++ b/Test/baseResults/spv.precisionNonESSamp.frag.out
@@ -1,5 +1,5 @@
 spv.precisionNonESSamp.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 47
 
diff --git a/Test/baseResults/spv.prepost.frag.out b/Test/baseResults/spv.prepost.frag.out
index 14c2b97ea..56ee45893 100755
--- a/Test/baseResults/spv.prepost.frag.out
+++ b/Test/baseResults/spv.prepost.frag.out
@@ -1,5 +1,5 @@
 spv.prepost.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 94
 
diff --git a/Test/baseResults/spv.pushConstant.vert.out b/Test/baseResults/spv.pushConstant.vert.out
index 9b6cbad62..591d6931d 100644
--- a/Test/baseResults/spv.pushConstant.vert.out
+++ b/Test/baseResults/spv.pushConstant.vert.out
@@ -1,5 +1,5 @@
 spv.pushConstant.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 
diff --git a/Test/baseResults/spv.pushConstantAnon.vert.out b/Test/baseResults/spv.pushConstantAnon.vert.out
index eef8e8caf..14af80327 100755
--- a/Test/baseResults/spv.pushConstantAnon.vert.out
+++ b/Test/baseResults/spv.pushConstantAnon.vert.out
@@ -1,5 +1,5 @@
 spv.pushConstantAnon.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 38
 
diff --git a/Test/baseResults/spv.qualifiers.vert.out b/Test/baseResults/spv.qualifiers.vert.out
index 461c12ca7..fca304dd2 100755
--- a/Test/baseResults/spv.qualifiers.vert.out
+++ b/Test/baseResults/spv.qualifiers.vert.out
@@ -1,5 +1,5 @@
 spv.qualifiers.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 21
 
diff --git a/Test/baseResults/spv.queryL.frag.out b/Test/baseResults/spv.queryL.frag.out
index 8d3ec3180..70e677bb2 100755
--- a/Test/baseResults/spv.queryL.frag.out
+++ b/Test/baseResults/spv.queryL.frag.out
@@ -1,5 +1,5 @@
 spv.queryL.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 224
 
diff --git a/Test/baseResults/spv.register.autoassign-2.frag.out b/Test/baseResults/spv.register.autoassign-2.frag.out
index c1939c645..6bc173b51 100644
--- a/Test/baseResults/spv.register.autoassign-2.frag.out
+++ b/Test/baseResults/spv.register.autoassign-2.frag.out
@@ -1,5 +1,5 @@
 spv.register.autoassign-2.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 47
 
diff --git a/Test/baseResults/spv.register.autoassign.frag.out b/Test/baseResults/spv.register.autoassign.frag.out
index e465148de..cf4dad735 100644
--- a/Test/baseResults/spv.register.autoassign.frag.out
+++ b/Test/baseResults/spv.register.autoassign.frag.out
@@ -1,5 +1,5 @@
 spv.register.autoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 155
 
diff --git a/Test/baseResults/spv.register.noautoassign.frag.out b/Test/baseResults/spv.register.noautoassign.frag.out
index ac1f3bbf1..da53f58e9 100644
--- a/Test/baseResults/spv.register.noautoassign.frag.out
+++ b/Test/baseResults/spv.register.noautoassign.frag.out
@@ -1,5 +1,5 @@
 spv.register.noautoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 155
 
diff --git a/Test/baseResults/spv.register.subpass.frag.out b/Test/baseResults/spv.register.subpass.frag.out
index 4fc4f5f50..3072f965b 100644
--- a/Test/baseResults/spv.register.subpass.frag.out
+++ b/Test/baseResults/spv.register.subpass.frag.out
@@ -1,5 +1,5 @@
 spv.register.subpass.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 40
 
diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out
index 52f49baa3..e234dc6ec 100644
--- a/Test/baseResults/spv.rw.autoassign.frag.out
+++ b/Test/baseResults/spv.rw.autoassign.frag.out
@@ -1,5 +1,5 @@
 spv.rw.autoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 42
 
diff --git a/Test/baseResults/spv.sample.frag.out b/Test/baseResults/spv.sample.frag.out
index 290c3ae53..306e635e0 100755
--- a/Test/baseResults/spv.sample.frag.out
+++ b/Test/baseResults/spv.sample.frag.out
@@ -1,5 +1,5 @@
 spv.sample.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 13
 
diff --git a/Test/baseResults/spv.sampleId.frag.out b/Test/baseResults/spv.sampleId.frag.out
index 70c5b2ce1..666e751ab 100755
--- a/Test/baseResults/spv.sampleId.frag.out
+++ b/Test/baseResults/spv.sampleId.frag.out
@@ -1,5 +1,5 @@
 spv.sampleId.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 26
 
diff --git a/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out b/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
index 80addb8b0..5ef07933a 100644
--- a/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
+++ b/Test/baseResults/spv.sampleMaskOverrideCoverage.frag.out
@@ -1,5 +1,5 @@
 spv.sampleMaskOverrideCoverage.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 
diff --git a/Test/baseResults/spv.samplePosition.frag.out b/Test/baseResults/spv.samplePosition.frag.out
index 164e9c4d5..ebd963bf0 100755
--- a/Test/baseResults/spv.samplePosition.frag.out
+++ b/Test/baseResults/spv.samplePosition.frag.out
@@ -1,5 +1,5 @@
 spv.samplePosition.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 30
 
diff --git a/Test/baseResults/spv.separate.frag.out b/Test/baseResults/spv.separate.frag.out
index 9f6de9539..3ef80132b 100644
--- a/Test/baseResults/spv.separate.frag.out
+++ b/Test/baseResults/spv.separate.frag.out
@@ -1,5 +1,5 @@
 spv.separate.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 319
 
diff --git a/Test/baseResults/spv.set.vert.out b/Test/baseResults/spv.set.vert.out
index 0bb217c31..a5a83630f 100755
--- a/Test/baseResults/spv.set.vert.out
+++ b/Test/baseResults/spv.set.vert.out
@@ -1,5 +1,5 @@
 spv.set.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/spv.shaderBallot.comp.out b/Test/baseResults/spv.shaderBallot.comp.out
index 833c9ed23..ec85d70e5 100644
--- a/Test/baseResults/spv.shaderBallot.comp.out
+++ b/Test/baseResults/spv.shaderBallot.comp.out
@@ -1,5 +1,5 @@
 spv.shaderBallot.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 298
 
diff --git a/Test/baseResults/spv.shaderBallotAMD.comp.out b/Test/baseResults/spv.shaderBallotAMD.comp.out
index d33f053e9..aca5ba6e9 100644
--- a/Test/baseResults/spv.shaderBallotAMD.comp.out
+++ b/Test/baseResults/spv.shaderBallotAMD.comp.out
@@ -1,5 +1,5 @@
 spv.shaderBallotAMD.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 1048
 
diff --git a/Test/baseResults/spv.shaderDrawParams.vert.out b/Test/baseResults/spv.shaderDrawParams.vert.out
index 2bf7d629d..0fb27ad3c 100644
--- a/Test/baseResults/spv.shaderDrawParams.vert.out
+++ b/Test/baseResults/spv.shaderDrawParams.vert.out
@@ -1,5 +1,5 @@
 spv.shaderDrawParams.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 
diff --git a/Test/baseResults/spv.shaderFragMaskAMD.frag.out b/Test/baseResults/spv.shaderFragMaskAMD.frag.out
index dff28bc2d..a703082c2 100644
--- a/Test/baseResults/spv.shaderFragMaskAMD.frag.out
+++ b/Test/baseResults/spv.shaderFragMaskAMD.frag.out
@@ -1,5 +1,5 @@
 spv.shaderFragMaskAMD.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 80
 
diff --git a/Test/baseResults/spv.shaderGroupVote.comp.out b/Test/baseResults/spv.shaderGroupVote.comp.out
index aefcea4d6..2b7e13a94 100644
--- a/Test/baseResults/spv.shaderGroupVote.comp.out
+++ b/Test/baseResults/spv.shaderGroupVote.comp.out
@@ -1,5 +1,5 @@
 spv.shaderGroupVote.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 33
 
diff --git a/Test/baseResults/spv.shaderStencilExport.frag.out b/Test/baseResults/spv.shaderStencilExport.frag.out
index 4afd5376f..5267ed990 100644
--- a/Test/baseResults/spv.shaderStencilExport.frag.out
+++ b/Test/baseResults/spv.shaderStencilExport.frag.out
@@ -1,5 +1,5 @@
 spv.shaderStencilExport.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 10
 
diff --git a/Test/baseResults/spv.shiftOps.frag.out b/Test/baseResults/spv.shiftOps.frag.out
index 836ee7196..22bcaf3ba 100644
--- a/Test/baseResults/spv.shiftOps.frag.out
+++ b/Test/baseResults/spv.shiftOps.frag.out
@@ -1,5 +1,5 @@
 spv.shiftOps.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 38
 
diff --git a/Test/baseResults/spv.shortCircuit.frag.out b/Test/baseResults/spv.shortCircuit.frag.out
index c5665eaa0..9ba472ad4 100644
--- a/Test/baseResults/spv.shortCircuit.frag.out
+++ b/Test/baseResults/spv.shortCircuit.frag.out
@@ -1,5 +1,5 @@
 spv.shortCircuit.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 147
 
diff --git a/Test/baseResults/spv.simpleFunctionCall.frag.out b/Test/baseResults/spv.simpleFunctionCall.frag.out
index b7902eeaa..0ee0f90b6 100755
--- a/Test/baseResults/spv.simpleFunctionCall.frag.out
+++ b/Test/baseResults/spv.simpleFunctionCall.frag.out
@@ -1,5 +1,5 @@
 spv.simpleFunctionCall.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 19
 
diff --git a/Test/baseResults/spv.simpleMat.vert.out b/Test/baseResults/spv.simpleMat.vert.out
index 793de2688..b57990627 100755
--- a/Test/baseResults/spv.simpleMat.vert.out
+++ b/Test/baseResults/spv.simpleMat.vert.out
@@ -1,7 +1,7 @@
 spv.simpleMat.vert
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 39
 
diff --git a/Test/baseResults/spv.sparseTexture.frag.out b/Test/baseResults/spv.sparseTexture.frag.out
index bc007cf1a..674f11c5d 100644
--- a/Test/baseResults/spv.sparseTexture.frag.out
+++ b/Test/baseResults/spv.sparseTexture.frag.out
@@ -1,5 +1,5 @@
 spv.sparseTexture.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 438
 
diff --git a/Test/baseResults/spv.sparseTextureClamp.frag.out b/Test/baseResults/spv.sparseTextureClamp.frag.out
index 2ff58a9a8..e9e662f66 100644
--- a/Test/baseResults/spv.sparseTextureClamp.frag.out
+++ b/Test/baseResults/spv.sparseTextureClamp.frag.out
@@ -1,5 +1,5 @@
 spv.sparseTextureClamp.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 360
 
diff --git a/Test/baseResults/spv.specConst.vert.out b/Test/baseResults/spv.specConst.vert.out
index afdb0c1e8..181d02a61 100755
--- a/Test/baseResults/spv.specConst.vert.out
+++ b/Test/baseResults/spv.specConst.vert.out
@@ -1,5 +1,5 @@
 spv.specConst.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 
diff --git a/Test/baseResults/spv.specConstant.comp.out b/Test/baseResults/spv.specConstant.comp.out
index 653af7237..4f4897bf0 100644
--- a/Test/baseResults/spv.specConstant.comp.out
+++ b/Test/baseResults/spv.specConstant.comp.out
@@ -1,5 +1,5 @@
 spv.specConstant.comp
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 
diff --git a/Test/baseResults/spv.specConstant.vert.out b/Test/baseResults/spv.specConstant.vert.out
index e4df66fc9..a8fc861c8 100644
--- a/Test/baseResults/spv.specConstant.vert.out
+++ b/Test/baseResults/spv.specConstant.vert.out
@@ -1,5 +1,5 @@
 spv.specConstant.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 81
 
diff --git a/Test/baseResults/spv.specConstantComposite.vert.out b/Test/baseResults/spv.specConstantComposite.vert.out
index 6680f66ba..e3cd68195 100644
--- a/Test/baseResults/spv.specConstantComposite.vert.out
+++ b/Test/baseResults/spv.specConstantComposite.vert.out
@@ -1,5 +1,5 @@
 spv.specConstantComposite.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 43
 
diff --git a/Test/baseResults/spv.specConstantOperations.vert.out b/Test/baseResults/spv.specConstantOperations.vert.out
index 348d9580f..2615eab49 100644
--- a/Test/baseResults/spv.specConstantOperations.vert.out
+++ b/Test/baseResults/spv.specConstantOperations.vert.out
@@ -1,5 +1,5 @@
 spv.specConstantOperations.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 162
 
diff --git a/Test/baseResults/spv.ssbo.autoassign.frag.out b/Test/baseResults/spv.ssbo.autoassign.frag.out
index 6fcaad4e4..d5e37cb32 100644
--- a/Test/baseResults/spv.ssbo.autoassign.frag.out
+++ b/Test/baseResults/spv.ssbo.autoassign.frag.out
@@ -1,5 +1,5 @@
 spv.ssbo.autoassign.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 99
 
diff --git a/Test/baseResults/spv.ssboAlias.frag.out b/Test/baseResults/spv.ssboAlias.frag.out
index cb087b558..68c2d6a02 100755
--- a/Test/baseResults/spv.ssboAlias.frag.out
+++ b/Test/baseResults/spv.ssboAlias.frag.out
@@ -1,5 +1,5 @@
 spv.ssboAlias.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 46
 
diff --git a/Test/baseResults/spv.stereoViewRendering.tesc.out b/Test/baseResults/spv.stereoViewRendering.tesc.out
index 0fe589134..b7dfa6362 100644
--- a/Test/baseResults/spv.stereoViewRendering.tesc.out
+++ b/Test/baseResults/spv.stereoViewRendering.tesc.out
@@ -1,5 +1,5 @@
 spv.stereoViewRendering.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 38
 
diff --git a/Test/baseResults/spv.stereoViewRendering.vert.out b/Test/baseResults/spv.stereoViewRendering.vert.out
index 18ecc0f81..31c6e2168 100644
--- a/Test/baseResults/spv.stereoViewRendering.vert.out
+++ b/Test/baseResults/spv.stereoViewRendering.vert.out
@@ -1,5 +1,5 @@
 spv.stereoViewRendering.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 27
 
diff --git a/Test/baseResults/spv.storageBuffer.vert.out b/Test/baseResults/spv.storageBuffer.vert.out
index 12bb5c7f8..09aef0d82 100755
--- a/Test/baseResults/spv.storageBuffer.vert.out
+++ b/Test/baseResults/spv.storageBuffer.vert.out
@@ -1,5 +1,5 @@
 spv.storageBuffer.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 31
 
diff --git a/Test/baseResults/spv.structAssignment.frag.out b/Test/baseResults/spv.structAssignment.frag.out
index 02e315c8f..b27d4f1bd 100755
--- a/Test/baseResults/spv.structAssignment.frag.out
+++ b/Test/baseResults/spv.structAssignment.frag.out
@@ -2,7 +2,7 @@ spv.structAssignment.frag
 WARNING: 0:6: '' : all default precisions are highp; use precision statements to quiet warning, e.g.:
          "precision mediump int; precision highp float;" 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 
diff --git a/Test/baseResults/spv.structDeref.frag.out b/Test/baseResults/spv.structDeref.frag.out
index 3d086ad4a..d1f469979 100755
--- a/Test/baseResults/spv.structDeref.frag.out
+++ b/Test/baseResults/spv.structDeref.frag.out
@@ -1,5 +1,5 @@
 spv.structDeref.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 123
 
diff --git a/Test/baseResults/spv.structure.frag.out b/Test/baseResults/spv.structure.frag.out
index aff943b1d..3238b331c 100755
--- a/Test/baseResults/spv.structure.frag.out
+++ b/Test/baseResults/spv.structure.frag.out
@@ -1,5 +1,5 @@
 spv.structure.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 60
 
diff --git a/Test/baseResults/spv.subpass.frag.out b/Test/baseResults/spv.subpass.frag.out
index e0a839a36..f89c795a8 100644
--- a/Test/baseResults/spv.subpass.frag.out
+++ b/Test/baseResults/spv.subpass.frag.out
@@ -1,5 +1,5 @@
 spv.subpass.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 67
 
diff --git a/Test/baseResults/spv.switch.frag.out b/Test/baseResults/spv.switch.frag.out
index 854f17412..d9eec0db1 100755
--- a/Test/baseResults/spv.switch.frag.out
+++ b/Test/baseResults/spv.switch.frag.out
@@ -3,7 +3,7 @@ WARNING: 0:121: 'switch' : last case/default label not followed by statements
 WARNING: 0:134: 'switch' : last case/default label not followed by statements 
 WARNING: 0:139: 'switch' : last case/default label not followed by statements 
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 269
 
diff --git a/Test/baseResults/spv.swizzle.frag.out b/Test/baseResults/spv.swizzle.frag.out
index 335cc3b5e..df7bcaf51 100755
--- a/Test/baseResults/spv.swizzle.frag.out
+++ b/Test/baseResults/spv.swizzle.frag.out
@@ -1,5 +1,5 @@
 spv.swizzle.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 108
 
diff --git a/Test/baseResults/spv.swizzleInversion.frag.out b/Test/baseResults/spv.swizzleInversion.frag.out
index 494f1af65..ada29a63a 100755
--- a/Test/baseResults/spv.swizzleInversion.frag.out
+++ b/Test/baseResults/spv.swizzleInversion.frag.out
@@ -1,5 +1,5 @@
 spv.swizzleInversion.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 46
 
diff --git a/Test/baseResults/spv.test.frag.out b/Test/baseResults/spv.test.frag.out
index 794a4b695..ea868f8b1 100644
--- a/Test/baseResults/spv.test.frag.out
+++ b/Test/baseResults/spv.test.frag.out
@@ -1,5 +1,5 @@
 spv.test.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 55
 
diff --git a/Test/baseResults/spv.test.vert.out b/Test/baseResults/spv.test.vert.out
index a7fad2c91..54fb81fd2 100644
--- a/Test/baseResults/spv.test.vert.out
+++ b/Test/baseResults/spv.test.vert.out
@@ -1,7 +1,7 @@
 spv.test.vert
 WARNING: 0:5: attribute deprecated in version 130; may be removed in future release
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 24
 
diff --git a/Test/baseResults/spv.texture.frag.out b/Test/baseResults/spv.texture.frag.out
index 935997539..1a601f7aa 100755
--- a/Test/baseResults/spv.texture.frag.out
+++ b/Test/baseResults/spv.texture.frag.out
@@ -3,7 +3,7 @@ WARNING: 0:10: varying deprecated in version 130; may be removed in future relea
 WARNING: 0:11: varying deprecated in version 130; may be removed in future release
 WARNING: 0:12: varying deprecated in version 130; may be removed in future release
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 305
 
diff --git a/Test/baseResults/spv.texture.sampler.transform.frag.out b/Test/baseResults/spv.texture.sampler.transform.frag.out
index a7600f099..d33ad5923 100644
--- a/Test/baseResults/spv.texture.sampler.transform.frag.out
+++ b/Test/baseResults/spv.texture.sampler.transform.frag.out
@@ -1,5 +1,5 @@
 spv.texture.sampler.transform.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 20
 
diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out
index dc53eb43c..9f94f242a 100755
--- a/Test/baseResults/spv.texture.vert.out
+++ b/Test/baseResults/spv.texture.vert.out
@@ -1,5 +1,5 @@
 spv.texture.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 150
 
diff --git a/Test/baseResults/spv.textureBuffer.vert.out b/Test/baseResults/spv.textureBuffer.vert.out
index 9d0c4fb1c..3850ce109 100755
--- a/Test/baseResults/spv.textureBuffer.vert.out
+++ b/Test/baseResults/spv.textureBuffer.vert.out
@@ -1,5 +1,5 @@
 spv.textureBuffer.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 42
 
diff --git a/Test/baseResults/spv.textureGatherBiasLod.frag.out b/Test/baseResults/spv.textureGatherBiasLod.frag.out
index 242810026..cc3149181 100644
--- a/Test/baseResults/spv.textureGatherBiasLod.frag.out
+++ b/Test/baseResults/spv.textureGatherBiasLod.frag.out
@@ -1,5 +1,5 @@
 spv.textureGatherBiasLod.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 298
 
diff --git a/Test/baseResults/spv.types.frag.out b/Test/baseResults/spv.types.frag.out
index b145a6d6f..704561acd 100755
--- a/Test/baseResults/spv.types.frag.out
+++ b/Test/baseResults/spv.types.frag.out
@@ -1,5 +1,5 @@
 spv.types.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 260
 
diff --git a/Test/baseResults/spv.uint.frag.out b/Test/baseResults/spv.uint.frag.out
index dc85ae6ec..9e1ccb1fd 100755
--- a/Test/baseResults/spv.uint.frag.out
+++ b/Test/baseResults/spv.uint.frag.out
@@ -1,5 +1,5 @@
 spv.uint.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 213
 
diff --git a/Test/baseResults/spv.uniformArray.frag.out b/Test/baseResults/spv.uniformArray.frag.out
index 4732de3f5..f355e2cf6 100644
--- a/Test/baseResults/spv.uniformArray.frag.out
+++ b/Test/baseResults/spv.uniformArray.frag.out
@@ -1,5 +1,5 @@
 spv.uniformArray.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 53
 
diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out
index 4cbd498bc..fd93913da 100755
--- a/Test/baseResults/spv.variableArrayIndex.frag.out
+++ b/Test/baseResults/spv.variableArrayIndex.frag.out
@@ -1,5 +1,5 @@
 spv.variableArrayIndex.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 93
 
diff --git a/Test/baseResults/spv.varyingArray.frag.out b/Test/baseResults/spv.varyingArray.frag.out
index c90351659..bc0979daa 100755
--- a/Test/baseResults/spv.varyingArray.frag.out
+++ b/Test/baseResults/spv.varyingArray.frag.out
@@ -1,5 +1,5 @@
 spv.varyingArray.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 61
 
diff --git a/Test/baseResults/spv.varyingArrayIndirect.frag.out b/Test/baseResults/spv.varyingArrayIndirect.frag.out
index 07ddd68fd..f7d69438e 100755
--- a/Test/baseResults/spv.varyingArrayIndirect.frag.out
+++ b/Test/baseResults/spv.varyingArrayIndirect.frag.out
@@ -1,5 +1,5 @@
 spv.varyingArrayIndirect.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 70
 
diff --git a/Test/baseResults/spv.viewportArray2.tesc.out b/Test/baseResults/spv.viewportArray2.tesc.out
index fe486cb3c..806a04a24 100644
--- a/Test/baseResults/spv.viewportArray2.tesc.out
+++ b/Test/baseResults/spv.viewportArray2.tesc.out
@@ -1,5 +1,5 @@
 spv.viewportArray2.tesc
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 25
 
diff --git a/Test/baseResults/spv.viewportArray2.vert.out b/Test/baseResults/spv.viewportArray2.vert.out
index dace23bde..d62370422 100644
--- a/Test/baseResults/spv.viewportArray2.vert.out
+++ b/Test/baseResults/spv.viewportArray2.vert.out
@@ -1,5 +1,5 @@
 spv.viewportArray2.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 19
 
diff --git a/Test/baseResults/spv.voidFunction.frag.out b/Test/baseResults/spv.voidFunction.frag.out
index 2bd3abd87..67acb3309 100755
--- a/Test/baseResults/spv.voidFunction.frag.out
+++ b/Test/baseResults/spv.voidFunction.frag.out
@@ -1,5 +1,5 @@
 spv.voidFunction.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 43
 
diff --git a/Test/baseResults/spv.while-continue-break.vert.out b/Test/baseResults/spv.while-continue-break.vert.out
index 329e7aa42..0b4bf473d 100644
--- a/Test/baseResults/spv.while-continue-break.vert.out
+++ b/Test/baseResults/spv.while-continue-break.vert.out
@@ -1,5 +1,5 @@
 spv.while-continue-break.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 41
 
diff --git a/Test/baseResults/spv.while-simple.vert.out b/Test/baseResults/spv.while-simple.vert.out
index 69792e1b9..c08d81c1b 100755
--- a/Test/baseResults/spv.while-simple.vert.out
+++ b/Test/baseResults/spv.while-simple.vert.out
@@ -1,5 +1,5 @@
 spv.while-simple.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 22
 
diff --git a/Test/baseResults/spv.whileLoop.frag.out b/Test/baseResults/spv.whileLoop.frag.out
index d78dfd1f2..bd54136fc 100755
--- a/Test/baseResults/spv.whileLoop.frag.out
+++ b/Test/baseResults/spv.whileLoop.frag.out
@@ -1,5 +1,5 @@
 spv.whileLoop.frag
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 
diff --git a/Test/baseResults/spv.xfb.vert.out b/Test/baseResults/spv.xfb.vert.out
index ae82e2078..9b0b975dd 100755
--- a/Test/baseResults/spv.xfb.vert.out
+++ b/Test/baseResults/spv.xfb.vert.out
@@ -1,5 +1,5 @@
 spv.xfb.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 16
 
diff --git a/Test/baseResults/spv.xfb2.vert.out b/Test/baseResults/spv.xfb2.vert.out
index d4d54f97b..0eb913732 100755
--- a/Test/baseResults/spv.xfb2.vert.out
+++ b/Test/baseResults/spv.xfb2.vert.out
@@ -1,5 +1,5 @@
 spv.xfb2.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 
diff --git a/Test/baseResults/spv.xfb3.vert.out b/Test/baseResults/spv.xfb3.vert.out
index c7b5b533a..7d31a8199 100755
--- a/Test/baseResults/spv.xfb3.vert.out
+++ b/Test/baseResults/spv.xfb3.vert.out
@@ -1,5 +1,5 @@
 spv.xfb3.vert
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 35
 
diff --git a/Test/baseResults/vulkan.ast.vert.out b/Test/baseResults/vulkan.ast.vert.out
index 19c8965e6..a2f2ec934 100755
--- a/Test/baseResults/vulkan.ast.vert.out
+++ b/Test/baseResults/vulkan.ast.vert.out
@@ -257,7 +257,7 @@ Shader version: 450
 0:?     'sci2' ( specialization-constant const highp int)
 0:?       2 (const int)
 
-// Module Version 10200
+// Module Version 10000
 // Generated by (magic number): 80003
 // Id's are bound by 50
 
-- 
GitLab