From fb06e9552ec81d0b9441b9c90b42d09ccdf28a99 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sat, 3 Dec 2016 13:58:46 -0700 Subject: [PATCH] Don't print the "Linked stage" message unless the AST is being dumped. --- Test/baseResults/100LimitsConf.vert.out | 4 ---- Test/baseResults/glspv.esversion.vert.out | 4 ---- Test/baseResults/glspv.frag.out | 4 ---- Test/baseResults/glspv.version.frag.out | 4 ---- Test/baseResults/glspv.version.vert.out | 4 ---- Test/baseResults/glspv.vert.out | 4 ---- Test/baseResults/hlsl.reflection.binding.frag.out | 4 ---- Test/baseResults/hlsl.reflection.vert.out | 4 ---- Test/baseResults/reflection.vert.out | 4 ---- Test/baseResults/remap.basic.dcefunc.frag.out | 4 ---- Test/baseResults/remap.basic.everything.frag.out | 4 ---- Test/baseResults/remap.basic.none.frag.out | 4 ---- Test/baseResults/remap.basic.strip.frag.out | 4 ---- Test/baseResults/remap.hlsl.sample.basic.everything.frag.out | 4 ---- Test/baseResults/remap.hlsl.sample.basic.none.frag.out | 4 ---- Test/baseResults/remap.hlsl.sample.basic.strip.frag.out | 4 ---- Test/baseResults/remap.hlsl.templatetypes.everything.frag.out | 4 ---- Test/baseResults/remap.hlsl.templatetypes.none.frag.out | 4 ---- Test/baseResults/remap.if.everything.frag.out | 4 ---- Test/baseResults/remap.if.none.frag.out | 4 ---- Test/baseResults/remap.similar_1a.everything.frag.out | 4 ---- Test/baseResults/remap.similar_1a.none.frag.out | 4 ---- Test/baseResults/remap.similar_1b.everything.frag.out | 4 ---- Test/baseResults/remap.similar_1b.none.frag.out | 4 ---- Test/baseResults/remap.switch.everything.frag.out | 4 ---- Test/baseResults/remap.switch.none.frag.out | 4 ---- Test/baseResults/remap.uniformarray.everything.frag.out | 4 ---- Test/baseResults/remap.uniformarray.none.frag.out | 4 ---- Test/baseResults/spv.100ops.frag.out | 4 ---- Test/baseResults/spv.130.frag.out | 4 ---- Test/baseResults/spv.140.frag.out | 4 ---- Test/baseResults/spv.150.geom.out | 4 ---- Test/baseResults/spv.150.vert.out | 4 ---- Test/baseResults/spv.300BuiltIns.vert.out | 4 ---- Test/baseResults/spv.300layout.frag.out | 4 ---- Test/baseResults/spv.300layout.vert.out | 4 ---- Test/baseResults/spv.300layoutp.vert.out | 4 ---- Test/baseResults/spv.310.bitcast.frag.out | 4 ---- Test/baseResults/spv.310.comp.out | 4 ---- Test/baseResults/spv.330.geom.out | 4 ---- Test/baseResults/spv.400.frag.out | 4 ---- Test/baseResults/spv.400.tesc.out | 4 ---- Test/baseResults/spv.400.tese.out | 4 ---- Test/baseResults/spv.420.geom.out | 4 ---- Test/baseResults/spv.430.frag.out | 4 ---- Test/baseResults/spv.430.vert.out | 4 ---- Test/baseResults/spv.450.tesc.out | 4 ---- Test/baseResults/spv.AofA.frag.out | 4 ---- Test/baseResults/spv.Operations.frag.out | 4 ---- Test/baseResults/spv.accessChain.frag.out | 4 ---- Test/baseResults/spv.aggOps.frag.out | 4 ---- Test/baseResults/spv.always-discard.frag.out | 4 ---- Test/baseResults/spv.always-discard2.frag.out | 4 ---- Test/baseResults/spv.atomic.comp.out | 4 ---- Test/baseResults/spv.bitCast.frag.out | 4 ---- Test/baseResults/spv.bool.vert.out | 4 ---- Test/baseResults/spv.boolInBlock.frag.out | 4 ---- Test/baseResults/spv.branch-return.vert.out | 4 ---- Test/baseResults/spv.buffer.autoassign.frag.out | 4 ---- Test/baseResults/spv.conditionalDiscard.frag.out | 4 ---- Test/baseResults/spv.conversion.frag.out | 4 ---- Test/baseResults/spv.dataOut.frag.out | 4 ---- Test/baseResults/spv.dataOutIndirect.frag.out | 4 ---- Test/baseResults/spv.dataOutIndirect.vert.out | 4 ---- Test/baseResults/spv.deepRvalue.frag.out | 4 ---- Test/baseResults/spv.depthOut.frag.out | 4 ---- Test/baseResults/spv.discard-dce.frag.out | 4 ---- Test/baseResults/spv.do-simple.vert.out | 4 ---- Test/baseResults/spv.do-while-continue-break.vert.out | 4 ---- Test/baseResults/spv.doWhileLoop.frag.out | 4 ---- Test/baseResults/spv.double.comp.out | 4 ---- Test/baseResults/spv.earlyReturnDiscard.frag.out | 4 ---- Test/baseResults/spv.float16.frag.out | 4 ---- Test/baseResults/spv.flowControl.frag.out | 4 ---- Test/baseResults/spv.for-complex-condition.vert.out | 4 ---- Test/baseResults/spv.for-continue-break.vert.out | 4 ---- Test/baseResults/spv.for-nobody.vert.out | 4 ---- Test/baseResults/spv.for-notest.vert.out | 4 ---- Test/baseResults/spv.for-simple.vert.out | 4 ---- Test/baseResults/spv.forLoop.frag.out | 4 ---- Test/baseResults/spv.forwardFun.frag.out | 4 ---- Test/baseResults/spv.functionCall.frag.out | 4 ---- Test/baseResults/spv.functionSemantics.frag.out | 4 ---- Test/baseResults/spv.glFragColor.frag.out | 4 ---- Test/baseResults/spv.glsl.register.autoassign.frag.out | 4 ---- Test/baseResults/spv.glsl.register.noautoassign.frag.out | 4 ---- Test/baseResults/spv.image.frag.out | 4 ---- Test/baseResults/spv.int64.frag.out | 4 ---- Test/baseResults/spv.intOps.vert.out | 4 ---- Test/baseResults/spv.interpOps.frag.out | 4 ---- Test/baseResults/spv.layoutNested.vert.out | 4 ---- Test/baseResults/spv.length.frag.out | 4 ---- Test/baseResults/spv.localAggregates.frag.out | 4 ---- Test/baseResults/spv.loops.frag.out | 4 ---- Test/baseResults/spv.loopsArtificial.frag.out | 4 ---- Test/baseResults/spv.matFun.vert.out | 4 ---- Test/baseResults/spv.matrix.frag.out | 4 ---- Test/baseResults/spv.matrix2.frag.out | 4 ---- Test/baseResults/spv.memoryQualifier.frag.out | 4 ---- Test/baseResults/spv.merge-unreachable.frag.out | 4 ---- Test/baseResults/spv.multiStruct.comp.out | 4 ---- Test/baseResults/spv.multiStructFuncall.frag.out | 4 ---- Test/baseResults/spv.newTexture.frag.out | 4 ---- Test/baseResults/spv.noDeadDecorations.vert.out | 4 ---- Test/baseResults/spv.noWorkgroup.comp.out | 4 ---- Test/baseResults/spv.nonSquare.vert.out | 4 ---- Test/baseResults/spv.offsets.frag.out | 4 ---- Test/baseResults/spv.precise.tesc.out | 4 ---- Test/baseResults/spv.precise.tese.out | 4 ---- Test/baseResults/spv.precision.frag.out | 4 ---- Test/baseResults/spv.prepost.frag.out | 4 ---- Test/baseResults/spv.pushConstant.vert.out | 4 ---- Test/baseResults/spv.qualifiers.vert.out | 4 ---- Test/baseResults/spv.queryL.frag.out | 4 ---- Test/baseResults/spv.register.autoassign-2.frag.out | 4 ---- Test/baseResults/spv.register.autoassign.frag.out | 4 ---- Test/baseResults/spv.register.autoassign.rangetest.frag.out | 3 --- Test/baseResults/spv.register.noautoassign.frag.out | 4 ---- Test/baseResults/spv.rw.autoassign.frag.out | 4 ---- Test/baseResults/spv.separate.frag.out | 4 ---- Test/baseResults/spv.set.vert.out | 4 ---- Test/baseResults/spv.shaderBallot.comp.out | 4 ---- Test/baseResults/spv.shaderDrawParams.vert.out | 4 ---- Test/baseResults/spv.shaderGroupVote.comp.out | 4 ---- Test/baseResults/spv.shiftOps.frag.out | 4 ---- Test/baseResults/spv.shortCircuit.frag.out | 4 ---- Test/baseResults/spv.simpleFunctionCall.frag.out | 4 ---- Test/baseResults/spv.simpleMat.vert.out | 4 ---- Test/baseResults/spv.sparseTexture.frag.out | 4 ---- Test/baseResults/spv.sparseTextureClamp.frag.out | 4 ---- Test/baseResults/spv.specConst.vert.out | 4 ---- Test/baseResults/spv.specConstant.comp.out | 4 ---- Test/baseResults/spv.specConstant.vert.out | 4 ---- Test/baseResults/spv.specConstantComposite.vert.out | 4 ---- Test/baseResults/spv.specConstantOperations.vert.out | 4 ---- Test/baseResults/spv.structAssignment.frag.out | 4 ---- Test/baseResults/spv.structDeref.frag.out | 4 ---- Test/baseResults/spv.structure.frag.out | 4 ---- Test/baseResults/spv.subpass.frag.out | 4 ---- Test/baseResults/spv.switch.frag.out | 4 ---- Test/baseResults/spv.swizzle.frag.out | 4 ---- Test/baseResults/spv.swizzleInversion.frag.out | 4 ---- Test/baseResults/spv.test.frag.out | 4 ---- Test/baseResults/spv.test.vert.out | 4 ---- Test/baseResults/spv.texture.frag.out | 4 ---- Test/baseResults/spv.texture.vert.out | 4 ---- Test/baseResults/spv.types.frag.out | 4 ---- Test/baseResults/spv.uint.frag.out | 4 ---- Test/baseResults/spv.uniformArray.frag.out | 4 ---- Test/baseResults/spv.variableArrayIndex.frag.out | 4 ---- Test/baseResults/spv.varyingArray.frag.out | 4 ---- Test/baseResults/spv.varyingArrayIndirect.frag.out | 4 ---- Test/baseResults/spv.voidFunction.frag.out | 4 ---- Test/baseResults/spv.while-continue-break.vert.out | 4 ---- Test/baseResults/spv.while-simple.vert.out | 4 ---- Test/baseResults/spv.whileLoop.frag.out | 4 ---- Test/baseResults/vulkan.comp.out | 4 ---- Test/baseResults/vulkan.frag.out | 3 --- Test/baseResults/vulkan.vert.out | 4 ---- glslang/Include/revision.h | 2 +- glslang/MachineIndependent/ShaderLang.cpp | 3 ++- 161 files changed, 3 insertions(+), 636 deletions(-) diff --git a/Test/baseResults/100LimitsConf.vert.out b/Test/baseResults/100LimitsConf.vert.out index e27c2cc7..46cb8453 100644 --- a/Test/baseResults/100LimitsConf.vert.out +++ b/Test/baseResults/100LimitsConf.vert.out @@ -22,7 +22,3 @@ ERROR: 0:65: 'limitations' : Non-constant-index-expression ERROR: 20 compilation errors. No code generated. - -Linked vertex stage: - - diff --git a/Test/baseResults/glspv.esversion.vert.out b/Test/baseResults/glspv.esversion.vert.out index ef406a18..8e4b3b88 100755 --- a/Test/baseResults/glspv.esversion.vert.out +++ b/Test/baseResults/glspv.esversion.vert.out @@ -4,8 +4,4 @@ Warning, version 310 is not yet complete; most version-specific features are pre ERROR: 1 compilation errors. No code generated. - -Linked vertex stage: - - SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/glspv.frag.out b/Test/baseResults/glspv.frag.out index 5df46c5b..daa1dc1e 100755 --- a/Test/baseResults/glspv.frag.out +++ b/Test/baseResults/glspv.frag.out @@ -6,8 +6,4 @@ ERROR: 0:14: '' : syntax error ERROR: 4 compilation errors. No code generated. - -Linked fragment stage: - - SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/glspv.version.frag.out b/Test/baseResults/glspv.version.frag.out index 7f44889f..3e8e8c4b 100755 --- a/Test/baseResults/glspv.version.frag.out +++ b/Test/baseResults/glspv.version.frag.out @@ -1,10 +1,6 @@ glspv.version.frag ERROR: #version: compilation for SPIR-V does not support the compatibility profile - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 6 diff --git a/Test/baseResults/glspv.version.vert.out b/Test/baseResults/glspv.version.vert.out index eb003dff..9683b3bd 100755 --- a/Test/baseResults/glspv.version.vert.out +++ b/Test/baseResults/glspv.version.vert.out @@ -3,8 +3,4 @@ ERROR: #version: Desktop shaders for OpenGL SPIR-V require version 330 or higher ERROR: 1 compilation errors. No code generated. - -Linked vertex stage: - - SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/glspv.vert.out b/Test/baseResults/glspv.vert.out index b91ab507..5f6d9bbd 100755 --- a/Test/baseResults/glspv.vert.out +++ b/Test/baseResults/glspv.vert.out @@ -11,8 +11,4 @@ ERROR: 0:20: '' : syntax error ERROR: 8 compilation errors. No code generated. - -Linked vertex stage: - - SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/hlsl.reflection.binding.frag.out b/Test/baseResults/hlsl.reflection.binding.frag.out index e26e0f6c..dd19621c 100644 --- a/Test/baseResults/hlsl.reflection.binding.frag.out +++ b/Test/baseResults/hlsl.reflection.binding.frag.out @@ -1,8 +1,4 @@ hlsl.reflection.binding.frag - -Linked fragment stage: - - Uniform reflection: t1: offset -1, type 8b5d, size 1, index -1, binding 15 s1: offset -1, type 0, size 1, index -1, binding 5 diff --git a/Test/baseResults/hlsl.reflection.vert.out b/Test/baseResults/hlsl.reflection.vert.out index cbce25ea..8ecfde61 100644 --- a/Test/baseResults/hlsl.reflection.vert.out +++ b/Test/baseResults/hlsl.reflection.vert.out @@ -1,8 +1,4 @@ hlsl.reflection.vert - -Linked vertex stage: - - Uniform reflection: anonMember3: offset 80, type 8b52, size 1, index 0, binding -1 s.a: offset 0, type 1404, size 1, index 1, binding -1 diff --git a/Test/baseResults/reflection.vert.out b/Test/baseResults/reflection.vert.out index 1e4c24fa..ba3e0e69 100644 --- a/Test/baseResults/reflection.vert.out +++ b/Test/baseResults/reflection.vert.out @@ -1,10 +1,6 @@ reflection.vert Warning, version 440 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - Uniform reflection: image_ui2D: offset -1, type 9063, size 1, index -1, binding -1 sampler_2D: offset -1, type 8b5e, size 1, index -1, binding -1 diff --git a/Test/baseResults/remap.basic.dcefunc.frag.out b/Test/baseResults/remap.basic.dcefunc.frag.out index 0f367c96..99b4d551 100644 --- a/Test/baseResults/remap.basic.dcefunc.frag.out +++ b/Test/baseResults/remap.basic.dcefunc.frag.out @@ -1,10 +1,6 @@ remap.basic.dcefunc.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 19 diff --git a/Test/baseResults/remap.basic.everything.frag.out b/Test/baseResults/remap.basic.everything.frag.out index f6d6ed44..357a8d2b 100644 --- a/Test/baseResults/remap.basic.everything.frag.out +++ b/Test/baseResults/remap.basic.everything.frag.out @@ -1,10 +1,6 @@ remap.basic.everything.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 3632309a..39e56b2e 100644 --- a/Test/baseResults/remap.basic.none.frag.out +++ b/Test/baseResults/remap.basic.none.frag.out @@ -1,10 +1,6 @@ remap.basic.none.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 20 diff --git a/Test/baseResults/remap.basic.strip.frag.out b/Test/baseResults/remap.basic.strip.frag.out index d34ce8ff..27c0874b 100644 --- a/Test/baseResults/remap.basic.strip.frag.out +++ b/Test/baseResults/remap.basic.strip.frag.out @@ -1,10 +1,6 @@ remap.basic.strip.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 20 diff --git a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out index bd1fa7e4..b49a10ba 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.everything.frag.out @@ -1,10 +1,6 @@ remap.hlsl.sample.basic.everything.frag WARNING: 0:4: 'immediate sampler state' : unimplemented - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 24916 diff --git a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out index b149718f..28c384ce 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.none.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.none.frag.out @@ -1,10 +1,6 @@ remap.hlsl.sample.basic.none.frag WARNING: 0:4: 'immediate sampler state' : unimplemented - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 190 diff --git a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out index 53407678..10a8938d 100644 --- a/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out +++ b/Test/baseResults/remap.hlsl.sample.basic.strip.frag.out @@ -1,10 +1,6 @@ remap.hlsl.sample.basic.strip.frag WARNING: 0:4: 'immediate sampler state' : unimplemented - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 190 diff --git a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out index 63eb6cbb..c42a037b 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.everything.frag.out @@ -1,8 +1,4 @@ remap.hlsl.templatetypes.everything.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 9012 diff --git a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out index df0dcf55..c3fab1a2 100644 --- a/Test/baseResults/remap.hlsl.templatetypes.none.frag.out +++ b/Test/baseResults/remap.hlsl.templatetypes.none.frag.out @@ -1,8 +1,4 @@ remap.hlsl.templatetypes.none.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 149 diff --git a/Test/baseResults/remap.if.everything.frag.out b/Test/baseResults/remap.if.everything.frag.out index 9f98c184..d20564c5 100644 --- a/Test/baseResults/remap.if.everything.frag.out +++ b/Test/baseResults/remap.if.everything.frag.out @@ -1,10 +1,6 @@ remap.if.everything.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 f3113a36..081d5cdd 100644 --- a/Test/baseResults/remap.if.none.frag.out +++ b/Test/baseResults/remap.if.none.frag.out @@ -1,10 +1,6 @@ remap.if.none.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 09589f57..384b8e86 100644 --- a/Test/baseResults/remap.similar_1a.everything.frag.out +++ b/Test/baseResults/remap.similar_1a.everything.frag.out @@ -1,10 +1,6 @@ remap.similar_1a.everything.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 17484512..ad1273ae 100644 --- a/Test/baseResults/remap.similar_1a.none.frag.out +++ b/Test/baseResults/remap.similar_1a.none.frag.out @@ -1,10 +1,6 @@ remap.similar_1a.none.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 82 diff --git a/Test/baseResults/remap.similar_1b.everything.frag.out b/Test/baseResults/remap.similar_1b.everything.frag.out index d05be117..0ce4544c 100644 --- a/Test/baseResults/remap.similar_1b.everything.frag.out +++ b/Test/baseResults/remap.similar_1b.everything.frag.out @@ -1,10 +1,6 @@ remap.similar_1b.everything.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 f9bf0847..b86fd4b6 100644 --- a/Test/baseResults/remap.similar_1b.none.frag.out +++ b/Test/baseResults/remap.similar_1b.none.frag.out @@ -1,10 +1,6 @@ remap.similar_1b.none.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 87 diff --git a/Test/baseResults/remap.switch.everything.frag.out b/Test/baseResults/remap.switch.everything.frag.out index a1d9b0d9..e5a7ef75 100644 --- a/Test/baseResults/remap.switch.everything.frag.out +++ b/Test/baseResults/remap.switch.everything.frag.out @@ -3,10 +3,6 @@ Warning, version 450 is not yet complete; most version-specific features are pre WARNING: 0:5: '' : all default precisions are highp; use precision statements to quiet warning, e.g.: "precision mediump int; precision highp float;" - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 7fc8f04b..5d373ccf 100644 --- a/Test/baseResults/remap.switch.none.frag.out +++ b/Test/baseResults/remap.switch.none.frag.out @@ -3,10 +3,6 @@ Warning, version 450 is not yet complete; most version-specific features are pre WARNING: 0:5: '' : all default precisions are highp; use precision statements to quiet warning, e.g.: "precision mediump int; precision highp float;" - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 44 diff --git a/Test/baseResults/remap.uniformarray.everything.frag.out b/Test/baseResults/remap.uniformarray.everything.frag.out index 18defecb..ed906d53 100644 --- a/Test/baseResults/remap.uniformarray.everything.frag.out +++ b/Test/baseResults/remap.uniformarray.everything.frag.out @@ -1,8 +1,4 @@ remap.uniformarray.everything.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 ff2489e3..526b9e49 100644 --- a/Test/baseResults/remap.uniformarray.none.frag.out +++ b/Test/baseResults/remap.uniformarray.none.frag.out @@ -1,8 +1,4 @@ remap.uniformarray.none.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 53 diff --git a/Test/baseResults/spv.100ops.frag.out b/Test/baseResults/spv.100ops.frag.out index 9b40c920..efd82012 100755 --- a/Test/baseResults/spv.100ops.frag.out +++ b/Test/baseResults/spv.100ops.frag.out @@ -1,10 +1,6 @@ spv.100ops.frag Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 49 diff --git a/Test/baseResults/spv.130.frag.out b/Test/baseResults/spv.130.frag.out index 8d881f50..19c6db0d 100644 --- a/Test/baseResults/spv.130.frag.out +++ b/Test/baseResults/spv.130.frag.out @@ -1,10 +1,6 @@ spv.130.frag WARNING: 0:31: '#extension' : extension is only partially supported: GL_ARB_gpu_shader5 - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 205 diff --git a/Test/baseResults/spv.140.frag.out b/Test/baseResults/spv.140.frag.out index f302478c..f8e75ebd 100755 --- a/Test/baseResults/spv.140.frag.out +++ b/Test/baseResults/spv.140.frag.out @@ -1,8 +1,4 @@ spv.140.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 101 diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out index 8b021ff9..1c98c70e 100755 --- a/Test/baseResults/spv.150.geom.out +++ b/Test/baseResults/spv.150.geom.out @@ -1,8 +1,4 @@ spv.150.geom - -Linked geometry stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 71 diff --git a/Test/baseResults/spv.150.vert.out b/Test/baseResults/spv.150.vert.out index 5ccf1a81..28431397 100755 --- a/Test/baseResults/spv.150.vert.out +++ b/Test/baseResults/spv.150.vert.out @@ -1,8 +1,4 @@ spv.150.vert - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 63 diff --git a/Test/baseResults/spv.300BuiltIns.vert.out b/Test/baseResults/spv.300BuiltIns.vert.out index ab07f4a8..7dc949dc 100755 --- a/Test/baseResults/spv.300BuiltIns.vert.out +++ b/Test/baseResults/spv.300BuiltIns.vert.out @@ -1,10 +1,6 @@ spv.300BuiltIns.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 42 diff --git a/Test/baseResults/spv.300layout.frag.out b/Test/baseResults/spv.300layout.frag.out index e340c1b2..7ce08d86 100755 --- a/Test/baseResults/spv.300layout.frag.out +++ b/Test/baseResults/spv.300layout.frag.out @@ -1,10 +1,6 @@ spv.300layout.frag Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 37 diff --git a/Test/baseResults/spv.300layout.vert.out b/Test/baseResults/spv.300layout.vert.out index 859794a3..20eb8e7d 100644 --- a/Test/baseResults/spv.300layout.vert.out +++ b/Test/baseResults/spv.300layout.vert.out @@ -1,10 +1,6 @@ spv.300layout.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 163 diff --git a/Test/baseResults/spv.300layoutp.vert.out b/Test/baseResults/spv.300layoutp.vert.out index ebad9635..5924137c 100755 --- a/Test/baseResults/spv.300layoutp.vert.out +++ b/Test/baseResults/spv.300layoutp.vert.out @@ -1,10 +1,6 @@ spv.300layoutp.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 80df3b1a..14e184a4 100755 --- a/Test/baseResults/spv.310.bitcast.frag.out +++ b/Test/baseResults/spv.310.bitcast.frag.out @@ -1,10 +1,6 @@ spv.310.bitcast.frag Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 153 diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out index bd1f3466..095bf39f 100644 --- a/Test/baseResults/spv.310.comp.out +++ b/Test/baseResults/spv.310.comp.out @@ -1,10 +1,6 @@ spv.310.comp Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 67 diff --git a/Test/baseResults/spv.330.geom.out b/Test/baseResults/spv.330.geom.out index 3077769a..3e81dcbc 100644 --- a/Test/baseResults/spv.330.geom.out +++ b/Test/baseResults/spv.330.geom.out @@ -1,8 +1,4 @@ spv.330.geom - -Linked geometry stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 32 diff --git a/Test/baseResults/spv.400.frag.out b/Test/baseResults/spv.400.frag.out index 7858845e..cb2de968 100644 --- a/Test/baseResults/spv.400.frag.out +++ b/Test/baseResults/spv.400.frag.out @@ -1,10 +1,6 @@ spv.400.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 1118 diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out index ae469aad..68b142e5 100644 --- a/Test/baseResults/spv.400.tesc.out +++ b/Test/baseResults/spv.400.tesc.out @@ -1,10 +1,6 @@ spv.400.tesc Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked tessellation control stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 93 diff --git a/Test/baseResults/spv.400.tese.out b/Test/baseResults/spv.400.tese.out index 51534b12..0c62bed6 100755 --- a/Test/baseResults/spv.400.tese.out +++ b/Test/baseResults/spv.400.tese.out @@ -1,10 +1,6 @@ spv.400.tese Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked tessellation evaluation stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 96 diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out index 78e3aaa2..6413d5a4 100644 --- a/Test/baseResults/spv.420.geom.out +++ b/Test/baseResults/spv.420.geom.out @@ -1,10 +1,6 @@ spv.420.geom Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. - -Linked geometry stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 72 diff --git a/Test/baseResults/spv.430.frag.out b/Test/baseResults/spv.430.frag.out index 0058e9c8..abe2a58a 100755 --- a/Test/baseResults/spv.430.frag.out +++ b/Test/baseResults/spv.430.frag.out @@ -1,10 +1,6 @@ spv.430.frag Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 24 diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out index c3ad2b92..8ea95d1a 100755 --- a/Test/baseResults/spv.430.vert.out +++ b/Test/baseResults/spv.430.vert.out @@ -1,10 +1,6 @@ spv.430.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 66 diff --git a/Test/baseResults/spv.450.tesc.out b/Test/baseResults/spv.450.tesc.out index 2900fdfc..a0bf3dd3 100755 --- a/Test/baseResults/spv.450.tesc.out +++ b/Test/baseResults/spv.450.tesc.out @@ -1,10 +1,6 @@ spv.450.tesc Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked tessellation control stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 23 diff --git a/Test/baseResults/spv.AofA.frag.out b/Test/baseResults/spv.AofA.frag.out index 0dbf69ce..4eb75630 100644 --- a/Test/baseResults/spv.AofA.frag.out +++ b/Test/baseResults/spv.AofA.frag.out @@ -1,10 +1,6 @@ spv.AofA.frag Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 104 diff --git a/Test/baseResults/spv.Operations.frag.out b/Test/baseResults/spv.Operations.frag.out index f8b666d5..1a74192e 100755 --- a/Test/baseResults/spv.Operations.frag.out +++ b/Test/baseResults/spv.Operations.frag.out @@ -1,10 +1,6 @@ spv.Operations.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 509 diff --git a/Test/baseResults/spv.accessChain.frag.out b/Test/baseResults/spv.accessChain.frag.out index 3d391c31..b319cfd1 100755 --- a/Test/baseResults/spv.accessChain.frag.out +++ b/Test/baseResults/spv.accessChain.frag.out @@ -1,10 +1,6 @@ spv.accessChain.frag Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 206 diff --git a/Test/baseResults/spv.aggOps.frag.out b/Test/baseResults/spv.aggOps.frag.out index 5a19d2f4..c3ceb9a6 100644 --- a/Test/baseResults/spv.aggOps.frag.out +++ b/Test/baseResults/spv.aggOps.frag.out @@ -3,10 +3,6 @@ Warning, version 450 is not yet complete; most version-specific features are pre WARNING: 0:4: '' : all default precisions are highp; use precision statements to quiet warning, e.g.: "precision mediump int; precision highp float;" - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 9102b3bb..652d45c8 100644 --- a/Test/baseResults/spv.always-discard.frag.out +++ b/Test/baseResults/spv.always-discard.frag.out @@ -1,8 +1,4 @@ spv.always-discard.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 7984c832..0bbb9eee 100755 --- a/Test/baseResults/spv.always-discard2.frag.out +++ b/Test/baseResults/spv.always-discard2.frag.out @@ -1,8 +1,4 @@ spv.always-discard2.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 40 diff --git a/Test/baseResults/spv.atomic.comp.out b/Test/baseResults/spv.atomic.comp.out index 01e09323..97c7f6e3 100755 --- a/Test/baseResults/spv.atomic.comp.out +++ b/Test/baseResults/spv.atomic.comp.out @@ -1,10 +1,6 @@ spv.atomic.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 73 diff --git a/Test/baseResults/spv.bitCast.frag.out b/Test/baseResults/spv.bitCast.frag.out index b0dc8104..07dd729e 100644 --- a/Test/baseResults/spv.bitCast.frag.out +++ b/Test/baseResults/spv.bitCast.frag.out @@ -1,10 +1,6 @@ spv.bitCast.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 172 diff --git a/Test/baseResults/spv.bool.vert.out b/Test/baseResults/spv.bool.vert.out index 49a69a0e..f84687a5 100644 --- a/Test/baseResults/spv.bool.vert.out +++ b/Test/baseResults/spv.bool.vert.out @@ -1,10 +1,6 @@ spv.bool.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 49 diff --git a/Test/baseResults/spv.boolInBlock.frag.out b/Test/baseResults/spv.boolInBlock.frag.out index 6e7cf40e..2181f26d 100644 --- a/Test/baseResults/spv.boolInBlock.frag.out +++ b/Test/baseResults/spv.boolInBlock.frag.out @@ -1,10 +1,6 @@ spv.boolInBlock.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 217a863f..9093135b 100644 --- a/Test/baseResults/spv.branch-return.vert.out +++ b/Test/baseResults/spv.branch-return.vert.out @@ -1,10 +1,6 @@ spv.branch-return.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 1d94707c..f2c8d6d9 100644 --- a/Test/baseResults/spv.buffer.autoassign.frag.out +++ b/Test/baseResults/spv.buffer.autoassign.frag.out @@ -1,8 +1,4 @@ spv.buffer.autoassign.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 45 diff --git a/Test/baseResults/spv.conditionalDiscard.frag.out b/Test/baseResults/spv.conditionalDiscard.frag.out index ef7e3b4c..b3cb8e86 100755 --- a/Test/baseResults/spv.conditionalDiscard.frag.out +++ b/Test/baseResults/spv.conditionalDiscard.frag.out @@ -1,10 +1,6 @@ spv.conditionalDiscard.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 36 diff --git a/Test/baseResults/spv.conversion.frag.out b/Test/baseResults/spv.conversion.frag.out index bc915698..b38d84e8 100755 --- a/Test/baseResults/spv.conversion.frag.out +++ b/Test/baseResults/spv.conversion.frag.out @@ -1,8 +1,4 @@ spv.conversion.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 455 diff --git a/Test/baseResults/spv.dataOut.frag.out b/Test/baseResults/spv.dataOut.frag.out index 651c96e3..9dbe5d12 100755 --- a/Test/baseResults/spv.dataOut.frag.out +++ b/Test/baseResults/spv.dataOut.frag.out @@ -1,8 +1,4 @@ spv.dataOut.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 20 diff --git a/Test/baseResults/spv.dataOutIndirect.frag.out b/Test/baseResults/spv.dataOutIndirect.frag.out index d1227a5b..663092fd 100755 --- a/Test/baseResults/spv.dataOutIndirect.frag.out +++ b/Test/baseResults/spv.dataOutIndirect.frag.out @@ -1,8 +1,4 @@ spv.dataOutIndirect.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 26 diff --git a/Test/baseResults/spv.dataOutIndirect.vert.out b/Test/baseResults/spv.dataOutIndirect.vert.out index 797c6518..1523fab5 100755 --- a/Test/baseResults/spv.dataOutIndirect.vert.out +++ b/Test/baseResults/spv.dataOutIndirect.vert.out @@ -1,10 +1,6 @@ spv.dataOutIndirect.vert WARNING: 0:3: attribute deprecated in version 130; may be removed in future release - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 38 diff --git a/Test/baseResults/spv.deepRvalue.frag.out b/Test/baseResults/spv.deepRvalue.frag.out index b4894383..29cf8488 100644 --- a/Test/baseResults/spv.deepRvalue.frag.out +++ b/Test/baseResults/spv.deepRvalue.frag.out @@ -1,8 +1,4 @@ spv.deepRvalue.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 155 diff --git a/Test/baseResults/spv.depthOut.frag.out b/Test/baseResults/spv.depthOut.frag.out index 6242391f..247b2f3d 100755 --- a/Test/baseResults/spv.depthOut.frag.out +++ b/Test/baseResults/spv.depthOut.frag.out @@ -1,10 +1,6 @@ spv.depthOut.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 15 diff --git a/Test/baseResults/spv.discard-dce.frag.out b/Test/baseResults/spv.discard-dce.frag.out index 7668233b..173ea260 100755 --- a/Test/baseResults/spv.discard-dce.frag.out +++ b/Test/baseResults/spv.discard-dce.frag.out @@ -1,8 +1,4 @@ spv.discard-dce.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 c0862d1e..d6d4c28f 100755 --- a/Test/baseResults/spv.do-simple.vert.out +++ b/Test/baseResults/spv.do-simple.vert.out @@ -1,10 +1,6 @@ spv.do-simple.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 ebfe85d0..d1d0c85c 100644 --- a/Test/baseResults/spv.do-while-continue-break.vert.out +++ b/Test/baseResults/spv.do-while-continue-break.vert.out @@ -1,10 +1,6 @@ spv.do-while-continue-break.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 43 diff --git a/Test/baseResults/spv.doWhileLoop.frag.out b/Test/baseResults/spv.doWhileLoop.frag.out index 1d12af10..9b8cee70 100755 --- a/Test/baseResults/spv.doWhileLoop.frag.out +++ b/Test/baseResults/spv.doWhileLoop.frag.out @@ -1,8 +1,4 @@ spv.doWhileLoop.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 34 diff --git a/Test/baseResults/spv.double.comp.out b/Test/baseResults/spv.double.comp.out index 766f839a..3b1bdc89 100755 --- a/Test/baseResults/spv.double.comp.out +++ b/Test/baseResults/spv.double.comp.out @@ -1,10 +1,6 @@ spv.double.comp Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 60 diff --git a/Test/baseResults/spv.earlyReturnDiscard.frag.out b/Test/baseResults/spv.earlyReturnDiscard.frag.out index 7e6409e6..41441b7f 100755 --- a/Test/baseResults/spv.earlyReturnDiscard.frag.out +++ b/Test/baseResults/spv.earlyReturnDiscard.frag.out @@ -1,8 +1,4 @@ spv.earlyReturnDiscard.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 110 diff --git a/Test/baseResults/spv.float16.frag.out b/Test/baseResults/spv.float16.frag.out index f1fe6e4e..5499b7e8 100644 --- a/Test/baseResults/spv.float16.frag.out +++ b/Test/baseResults/spv.float16.frag.out @@ -1,10 +1,6 @@ spv.float16.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 534 diff --git a/Test/baseResults/spv.flowControl.frag.out b/Test/baseResults/spv.flowControl.frag.out index 7ca61b7a..274cb746 100755 --- a/Test/baseResults/spv.flowControl.frag.out +++ b/Test/baseResults/spv.flowControl.frag.out @@ -1,8 +1,4 @@ spv.flowControl.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 c5fe4389..bb3bc2a1 100644 --- a/Test/baseResults/spv.for-complex-condition.vert.out +++ b/Test/baseResults/spv.for-complex-condition.vert.out @@ -1,10 +1,6 @@ spv.for-complex-condition.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 35 diff --git a/Test/baseResults/spv.for-continue-break.vert.out b/Test/baseResults/spv.for-continue-break.vert.out index 0ea2f143..764001db 100644 --- a/Test/baseResults/spv.for-continue-break.vert.out +++ b/Test/baseResults/spv.for-continue-break.vert.out @@ -1,10 +1,6 @@ spv.for-continue-break.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 a127b709..0ec3584d 100644 --- a/Test/baseResults/spv.for-nobody.vert.out +++ b/Test/baseResults/spv.for-nobody.vert.out @@ -1,10 +1,6 @@ spv.for-nobody.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 67706701..c7346f9d 100644 --- a/Test/baseResults/spv.for-notest.vert.out +++ b/Test/baseResults/spv.for-notest.vert.out @@ -1,10 +1,6 @@ spv.for-notest.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 52a047ff..996b65a4 100755 --- a/Test/baseResults/spv.for-simple.vert.out +++ b/Test/baseResults/spv.for-simple.vert.out @@ -1,10 +1,6 @@ spv.for-simple.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 24 diff --git a/Test/baseResults/spv.forLoop.frag.out b/Test/baseResults/spv.forLoop.frag.out index e606f9cc..628c791f 100755 --- a/Test/baseResults/spv.forLoop.frag.out +++ b/Test/baseResults/spv.forLoop.frag.out @@ -1,8 +1,4 @@ spv.forLoop.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 131 diff --git a/Test/baseResults/spv.forwardFun.frag.out b/Test/baseResults/spv.forwardFun.frag.out index a804e1df..65759531 100755 --- a/Test/baseResults/spv.forwardFun.frag.out +++ b/Test/baseResults/spv.forwardFun.frag.out @@ -1,8 +1,4 @@ spv.forwardFun.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 60 diff --git a/Test/baseResults/spv.functionCall.frag.out b/Test/baseResults/spv.functionCall.frag.out index db40dd51..69a525f7 100755 --- a/Test/baseResults/spv.functionCall.frag.out +++ b/Test/baseResults/spv.functionCall.frag.out @@ -3,10 +3,6 @@ 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 - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 76 diff --git a/Test/baseResults/spv.functionSemantics.frag.out b/Test/baseResults/spv.functionSemantics.frag.out index aa2abd84..005a315b 100755 --- a/Test/baseResults/spv.functionSemantics.frag.out +++ b/Test/baseResults/spv.functionSemantics.frag.out @@ -1,10 +1,6 @@ spv.functionSemantics.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 156 diff --git a/Test/baseResults/spv.glFragColor.frag.out b/Test/baseResults/spv.glFragColor.frag.out index df825a09..febbdf46 100755 --- a/Test/baseResults/spv.glFragColor.frag.out +++ b/Test/baseResults/spv.glFragColor.frag.out @@ -1,8 +1,4 @@ spv.glFragColor.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 a9c1bda9..11818f64 100644 --- a/Test/baseResults/spv.glsl.register.autoassign.frag.out +++ b/Test/baseResults/spv.glsl.register.autoassign.frag.out @@ -1,10 +1,6 @@ spv.glsl.register.autoassign.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 05bf3cf0..327ac04a 100644 --- a/Test/baseResults/spv.glsl.register.noautoassign.frag.out +++ b/Test/baseResults/spv.glsl.register.noautoassign.frag.out @@ -1,10 +1,6 @@ spv.glsl.register.noautoassign.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 142 diff --git a/Test/baseResults/spv.image.frag.out b/Test/baseResults/spv.image.frag.out index 2bd26f79..2dd7d4b3 100644 --- a/Test/baseResults/spv.image.frag.out +++ b/Test/baseResults/spv.image.frag.out @@ -1,10 +1,6 @@ spv.image.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 378 diff --git a/Test/baseResults/spv.int64.frag.out b/Test/baseResults/spv.int64.frag.out index acfee730..cb5433ec 100644 --- a/Test/baseResults/spv.int64.frag.out +++ b/Test/baseResults/spv.int64.frag.out @@ -1,10 +1,6 @@ spv.int64.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 480 diff --git a/Test/baseResults/spv.intOps.vert.out b/Test/baseResults/spv.intOps.vert.out index 22451b9f..93d2dfda 100644 --- a/Test/baseResults/spv.intOps.vert.out +++ b/Test/baseResults/spv.intOps.vert.out @@ -1,10 +1,6 @@ spv.intOps.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 268 diff --git a/Test/baseResults/spv.interpOps.frag.out b/Test/baseResults/spv.interpOps.frag.out index a5076421..88d8e53c 100644 --- a/Test/baseResults/spv.interpOps.frag.out +++ b/Test/baseResults/spv.interpOps.frag.out @@ -1,10 +1,6 @@ spv.interpOps.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 100 diff --git a/Test/baseResults/spv.layoutNested.vert.out b/Test/baseResults/spv.layoutNested.vert.out index fd785ab4..0d0b28bb 100644 --- a/Test/baseResults/spv.layoutNested.vert.out +++ b/Test/baseResults/spv.layoutNested.vert.out @@ -1,10 +1,6 @@ spv.layoutNested.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 66 diff --git a/Test/baseResults/spv.length.frag.out b/Test/baseResults/spv.length.frag.out index 81f98a61..76f6ca63 100755 --- a/Test/baseResults/spv.length.frag.out +++ b/Test/baseResults/spv.length.frag.out @@ -1,8 +1,4 @@ spv.length.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 33 diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out index 21c389a0..7ffa8741 100755 --- a/Test/baseResults/spv.localAggregates.frag.out +++ b/Test/baseResults/spv.localAggregates.frag.out @@ -1,10 +1,6 @@ spv.localAggregates.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 136 diff --git a/Test/baseResults/spv.loops.frag.out b/Test/baseResults/spv.loops.frag.out index 952f7941..8b1b4807 100755 --- a/Test/baseResults/spv.loops.frag.out +++ b/Test/baseResults/spv.loops.frag.out @@ -1,8 +1,4 @@ spv.loops.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 725 diff --git a/Test/baseResults/spv.loopsArtificial.frag.out b/Test/baseResults/spv.loopsArtificial.frag.out index 5f10bd35..707a78df 100755 --- a/Test/baseResults/spv.loopsArtificial.frag.out +++ b/Test/baseResults/spv.loopsArtificial.frag.out @@ -1,8 +1,4 @@ spv.loopsArtificial.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 158 diff --git a/Test/baseResults/spv.matFun.vert.out b/Test/baseResults/spv.matFun.vert.out index 0aa0a52d..38d9d2cf 100755 --- a/Test/baseResults/spv.matFun.vert.out +++ b/Test/baseResults/spv.matFun.vert.out @@ -1,10 +1,6 @@ spv.matFun.vert Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 103 diff --git a/Test/baseResults/spv.matrix.frag.out b/Test/baseResults/spv.matrix.frag.out index 7b34fca4..700e90eb 100644 --- a/Test/baseResults/spv.matrix.frag.out +++ b/Test/baseResults/spv.matrix.frag.out @@ -1,10 +1,6 @@ spv.matrix.frag Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 261 diff --git a/Test/baseResults/spv.matrix2.frag.out b/Test/baseResults/spv.matrix2.frag.out index e0497b09..78facff3 100644 --- a/Test/baseResults/spv.matrix2.frag.out +++ b/Test/baseResults/spv.matrix2.frag.out @@ -1,8 +1,4 @@ spv.matrix2.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 221 diff --git a/Test/baseResults/spv.memoryQualifier.frag.out b/Test/baseResults/spv.memoryQualifier.frag.out index e2bfb392..a990e475 100644 --- a/Test/baseResults/spv.memoryQualifier.frag.out +++ b/Test/baseResults/spv.memoryQualifier.frag.out @@ -1,10 +1,6 @@ spv.memoryQualifier.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 6e326187..58bbb062 100644 --- a/Test/baseResults/spv.merge-unreachable.frag.out +++ b/Test/baseResults/spv.merge-unreachable.frag.out @@ -1,10 +1,6 @@ spv.merge-unreachable.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 25 diff --git a/Test/baseResults/spv.multiStruct.comp.out b/Test/baseResults/spv.multiStruct.comp.out index 28402ce2..f8c0eead 100755 --- a/Test/baseResults/spv.multiStruct.comp.out +++ b/Test/baseResults/spv.multiStruct.comp.out @@ -1,10 +1,6 @@ spv.multiStruct.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 157 diff --git a/Test/baseResults/spv.multiStructFuncall.frag.out b/Test/baseResults/spv.multiStructFuncall.frag.out index dcbcfa00..b9b0cb2c 100755 --- a/Test/baseResults/spv.multiStructFuncall.frag.out +++ b/Test/baseResults/spv.multiStructFuncall.frag.out @@ -1,10 +1,6 @@ spv.multiStructFuncall.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 63 diff --git a/Test/baseResults/spv.newTexture.frag.out b/Test/baseResults/spv.newTexture.frag.out index 3206faa3..ea694eea 100755 --- a/Test/baseResults/spv.newTexture.frag.out +++ b/Test/baseResults/spv.newTexture.frag.out @@ -1,10 +1,6 @@ spv.newTexture.frag Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 284 diff --git a/Test/baseResults/spv.noDeadDecorations.vert.out b/Test/baseResults/spv.noDeadDecorations.vert.out index e9b23566..41d2a431 100644 --- a/Test/baseResults/spv.noDeadDecorations.vert.out +++ b/Test/baseResults/spv.noDeadDecorations.vert.out @@ -1,10 +1,6 @@ spv.noDeadDecorations.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 32 diff --git a/Test/baseResults/spv.noWorkgroup.comp.out b/Test/baseResults/spv.noWorkgroup.comp.out index f12e6202..0f88436c 100755 --- a/Test/baseResults/spv.noWorkgroup.comp.out +++ b/Test/baseResults/spv.noWorkgroup.comp.out @@ -1,10 +1,6 @@ spv.noWorkgroup.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 12 diff --git a/Test/baseResults/spv.nonSquare.vert.out b/Test/baseResults/spv.nonSquare.vert.out index 329a71cb..684d4f16 100755 --- a/Test/baseResults/spv.nonSquare.vert.out +++ b/Test/baseResults/spv.nonSquare.vert.out @@ -1,8 +1,4 @@ spv.nonSquare.vert - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 90 diff --git a/Test/baseResults/spv.offsets.frag.out b/Test/baseResults/spv.offsets.frag.out index b0091eaa..ea4be8f4 100755 --- a/Test/baseResults/spv.offsets.frag.out +++ b/Test/baseResults/spv.offsets.frag.out @@ -1,10 +1,6 @@ spv.offsets.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 15 diff --git a/Test/baseResults/spv.precise.tesc.out b/Test/baseResults/spv.precise.tesc.out index 0331a14a..4bae395a 100644 --- a/Test/baseResults/spv.precise.tesc.out +++ b/Test/baseResults/spv.precise.tesc.out @@ -1,10 +1,6 @@ spv.precise.tesc Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked tessellation control stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 72 diff --git a/Test/baseResults/spv.precise.tese.out b/Test/baseResults/spv.precise.tese.out index 40339812..4f1839c7 100644 --- a/Test/baseResults/spv.precise.tese.out +++ b/Test/baseResults/spv.precise.tese.out @@ -1,10 +1,6 @@ spv.precise.tese Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked tessellation evaluation stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 119 diff --git a/Test/baseResults/spv.precision.frag.out b/Test/baseResults/spv.precision.frag.out index 33e4fb20..f49b3566 100755 --- a/Test/baseResults/spv.precision.frag.out +++ b/Test/baseResults/spv.precision.frag.out @@ -1,10 +1,6 @@ spv.precision.frag Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 127 diff --git a/Test/baseResults/spv.prepost.frag.out b/Test/baseResults/spv.prepost.frag.out index 9581267b..410286ca 100755 --- a/Test/baseResults/spv.prepost.frag.out +++ b/Test/baseResults/spv.prepost.frag.out @@ -1,8 +1,4 @@ spv.prepost.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 94 diff --git a/Test/baseResults/spv.pushConstant.vert.out b/Test/baseResults/spv.pushConstant.vert.out index 6b314e08..bdefd63d 100644 --- a/Test/baseResults/spv.pushConstant.vert.out +++ b/Test/baseResults/spv.pushConstant.vert.out @@ -1,10 +1,6 @@ spv.pushConstant.vert Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 35 diff --git a/Test/baseResults/spv.qualifiers.vert.out b/Test/baseResults/spv.qualifiers.vert.out index d2baf722..37f474cc 100755 --- a/Test/baseResults/spv.qualifiers.vert.out +++ b/Test/baseResults/spv.qualifiers.vert.out @@ -1,10 +1,6 @@ spv.qualifiers.vert Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 21 diff --git a/Test/baseResults/spv.queryL.frag.out b/Test/baseResults/spv.queryL.frag.out index 2236c66a..fbdcbc81 100755 --- a/Test/baseResults/spv.queryL.frag.out +++ b/Test/baseResults/spv.queryL.frag.out @@ -1,10 +1,6 @@ spv.queryL.frag Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 24ce5719..6d2ad36e 100644 --- a/Test/baseResults/spv.register.autoassign-2.frag.out +++ b/Test/baseResults/spv.register.autoassign-2.frag.out @@ -1,8 +1,4 @@ spv.register.autoassign-2.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 31 diff --git a/Test/baseResults/spv.register.autoassign.frag.out b/Test/baseResults/spv.register.autoassign.frag.out index 708f4750..4b4655e3 100644 --- a/Test/baseResults/spv.register.autoassign.frag.out +++ b/Test/baseResults/spv.register.autoassign.frag.out @@ -1,8 +1,4 @@ spv.register.autoassign.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 150 diff --git a/Test/baseResults/spv.register.autoassign.rangetest.frag.out b/Test/baseResults/spv.register.autoassign.rangetest.frag.out index 94933fba..8eb76c9b 100644 --- a/Test/baseResults/spv.register.autoassign.rangetest.frag.out +++ b/Test/baseResults/spv.register.autoassign.rangetest.frag.out @@ -1,7 +1,4 @@ spv.register.autoassign.rangetest.frag - -Linked fragment stage: - INTERNAL ERROR: mapped binding out of range: g_tSamp INTERNAL ERROR: mapped binding out of range: g_tScene diff --git a/Test/baseResults/spv.register.noautoassign.frag.out b/Test/baseResults/spv.register.noautoassign.frag.out index ad476eeb..71140dcd 100644 --- a/Test/baseResults/spv.register.noautoassign.frag.out +++ b/Test/baseResults/spv.register.noautoassign.frag.out @@ -1,8 +1,4 @@ spv.register.noautoassign.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 150 diff --git a/Test/baseResults/spv.rw.autoassign.frag.out b/Test/baseResults/spv.rw.autoassign.frag.out index 851ef463..d6b75ba3 100644 --- a/Test/baseResults/spv.rw.autoassign.frag.out +++ b/Test/baseResults/spv.rw.autoassign.frag.out @@ -1,8 +1,4 @@ spv.rw.autoassign.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 37 diff --git a/Test/baseResults/spv.separate.frag.out b/Test/baseResults/spv.separate.frag.out index 2a71a019..c654117f 100644 --- a/Test/baseResults/spv.separate.frag.out +++ b/Test/baseResults/spv.separate.frag.out @@ -1,10 +1,6 @@ spv.separate.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 319 diff --git a/Test/baseResults/spv.set.vert.out b/Test/baseResults/spv.set.vert.out index 72fbaa70..38cb669c 100755 --- a/Test/baseResults/spv.set.vert.out +++ b/Test/baseResults/spv.set.vert.out @@ -1,10 +1,6 @@ spv.set.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 22 diff --git a/Test/baseResults/spv.shaderBallot.comp.out b/Test/baseResults/spv.shaderBallot.comp.out index b837b8bc..4f033128 100644 --- a/Test/baseResults/spv.shaderBallot.comp.out +++ b/Test/baseResults/spv.shaderBallot.comp.out @@ -1,10 +1,6 @@ spv.shaderBallot.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 299 diff --git a/Test/baseResults/spv.shaderDrawParams.vert.out b/Test/baseResults/spv.shaderDrawParams.vert.out index ad538107..41ad78d4 100644 --- a/Test/baseResults/spv.shaderDrawParams.vert.out +++ b/Test/baseResults/spv.shaderDrawParams.vert.out @@ -1,10 +1,6 @@ spv.shaderDrawParams.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 53 diff --git a/Test/baseResults/spv.shaderGroupVote.comp.out b/Test/baseResults/spv.shaderGroupVote.comp.out index e63164d0..f8bfae80 100644 --- a/Test/baseResults/spv.shaderGroupVote.comp.out +++ b/Test/baseResults/spv.shaderGroupVote.comp.out @@ -1,10 +1,6 @@ spv.shaderGroupVote.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 37 diff --git a/Test/baseResults/spv.shiftOps.frag.out b/Test/baseResults/spv.shiftOps.frag.out index 39e40ece..498c2877 100644 --- a/Test/baseResults/spv.shiftOps.frag.out +++ b/Test/baseResults/spv.shiftOps.frag.out @@ -1,10 +1,6 @@ spv.shiftOps.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 38 diff --git a/Test/baseResults/spv.shortCircuit.frag.out b/Test/baseResults/spv.shortCircuit.frag.out index 5b39b1cb..7d5189a2 100644 --- a/Test/baseResults/spv.shortCircuit.frag.out +++ b/Test/baseResults/spv.shortCircuit.frag.out @@ -1,10 +1,6 @@ spv.shortCircuit.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 147 diff --git a/Test/baseResults/spv.simpleFunctionCall.frag.out b/Test/baseResults/spv.simpleFunctionCall.frag.out index 458a90db..2e6b671f 100755 --- a/Test/baseResults/spv.simpleFunctionCall.frag.out +++ b/Test/baseResults/spv.simpleFunctionCall.frag.out @@ -1,8 +1,4 @@ spv.simpleFunctionCall.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 19 diff --git a/Test/baseResults/spv.simpleMat.vert.out b/Test/baseResults/spv.simpleMat.vert.out index 3e0f05e1..2cad6313 100755 --- a/Test/baseResults/spv.simpleMat.vert.out +++ b/Test/baseResults/spv.simpleMat.vert.out @@ -1,10 +1,6 @@ spv.simpleMat.vert WARNING: 0:3: varying deprecated in version 130; may be removed in future release - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 39 diff --git a/Test/baseResults/spv.sparseTexture.frag.out b/Test/baseResults/spv.sparseTexture.frag.out index ae48f41d..431ef152 100644 --- a/Test/baseResults/spv.sparseTexture.frag.out +++ b/Test/baseResults/spv.sparseTexture.frag.out @@ -1,10 +1,6 @@ spv.sparseTexture.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 438 diff --git a/Test/baseResults/spv.sparseTextureClamp.frag.out b/Test/baseResults/spv.sparseTextureClamp.frag.out index 1922ac12..175dc35c 100644 --- a/Test/baseResults/spv.sparseTextureClamp.frag.out +++ b/Test/baseResults/spv.sparseTextureClamp.frag.out @@ -1,10 +1,6 @@ spv.sparseTextureClamp.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 360 diff --git a/Test/baseResults/spv.specConst.vert.out b/Test/baseResults/spv.specConst.vert.out index db5a417c..5a7de46f 100755 --- a/Test/baseResults/spv.specConst.vert.out +++ b/Test/baseResults/spv.specConst.vert.out @@ -1,10 +1,6 @@ spv.specConst.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 27 diff --git a/Test/baseResults/spv.specConstant.comp.out b/Test/baseResults/spv.specConstant.comp.out index 2f16f04d..481ed68c 100644 --- a/Test/baseResults/spv.specConstant.comp.out +++ b/Test/baseResults/spv.specConstant.comp.out @@ -1,10 +1,6 @@ spv.specConstant.comp Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked compute stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 27 diff --git a/Test/baseResults/spv.specConstant.vert.out b/Test/baseResults/spv.specConstant.vert.out index edda4a7b..dc10e238 100644 --- a/Test/baseResults/spv.specConstant.vert.out +++ b/Test/baseResults/spv.specConstant.vert.out @@ -1,10 +1,6 @@ spv.specConstant.vert Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 81 diff --git a/Test/baseResults/spv.specConstantComposite.vert.out b/Test/baseResults/spv.specConstantComposite.vert.out index c4585e40..f8c556ed 100644 --- a/Test/baseResults/spv.specConstantComposite.vert.out +++ b/Test/baseResults/spv.specConstantComposite.vert.out @@ -1,10 +1,6 @@ spv.specConstantComposite.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 43 diff --git a/Test/baseResults/spv.specConstantOperations.vert.out b/Test/baseResults/spv.specConstantOperations.vert.out index ab425583..e2395c82 100644 --- a/Test/baseResults/spv.specConstantOperations.vert.out +++ b/Test/baseResults/spv.specConstantOperations.vert.out @@ -1,10 +1,6 @@ spv.specConstantOperations.vert Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 135 diff --git a/Test/baseResults/spv.structAssignment.frag.out b/Test/baseResults/spv.structAssignment.frag.out index abff6834..eb796f7c 100755 --- a/Test/baseResults/spv.structAssignment.frag.out +++ b/Test/baseResults/spv.structAssignment.frag.out @@ -2,10 +2,6 @@ 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;" - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 50 diff --git a/Test/baseResults/spv.structDeref.frag.out b/Test/baseResults/spv.structDeref.frag.out index 78ebdc63..e60159f9 100755 --- a/Test/baseResults/spv.structDeref.frag.out +++ b/Test/baseResults/spv.structDeref.frag.out @@ -1,8 +1,4 @@ spv.structDeref.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 123 diff --git a/Test/baseResults/spv.structure.frag.out b/Test/baseResults/spv.structure.frag.out index 8d91ed04..f7cb2d2a 100755 --- a/Test/baseResults/spv.structure.frag.out +++ b/Test/baseResults/spv.structure.frag.out @@ -1,8 +1,4 @@ spv.structure.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 60 diff --git a/Test/baseResults/spv.subpass.frag.out b/Test/baseResults/spv.subpass.frag.out index 93d680c7..c2421113 100644 --- a/Test/baseResults/spv.subpass.frag.out +++ b/Test/baseResults/spv.subpass.frag.out @@ -1,10 +1,6 @@ spv.subpass.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 67 diff --git a/Test/baseResults/spv.switch.frag.out b/Test/baseResults/spv.switch.frag.out index 87ea4c87..86acb6c8 100755 --- a/Test/baseResults/spv.switch.frag.out +++ b/Test/baseResults/spv.switch.frag.out @@ -4,10 +4,6 @@ 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 - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 269 diff --git a/Test/baseResults/spv.swizzle.frag.out b/Test/baseResults/spv.swizzle.frag.out index 471fed11..46978f8c 100755 --- a/Test/baseResults/spv.swizzle.frag.out +++ b/Test/baseResults/spv.swizzle.frag.out @@ -1,8 +1,4 @@ spv.swizzle.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 108 diff --git a/Test/baseResults/spv.swizzleInversion.frag.out b/Test/baseResults/spv.swizzleInversion.frag.out index 6b922065..bf0699a3 100755 --- a/Test/baseResults/spv.swizzleInversion.frag.out +++ b/Test/baseResults/spv.swizzleInversion.frag.out @@ -1,10 +1,6 @@ spv.swizzleInversion.frag Warning, version 450 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 46 diff --git a/Test/baseResults/spv.test.frag.out b/Test/baseResults/spv.test.frag.out index 8f1c5260..bf0135ae 100644 --- a/Test/baseResults/spv.test.frag.out +++ b/Test/baseResults/spv.test.frag.out @@ -1,10 +1,6 @@ spv.test.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 55 diff --git a/Test/baseResults/spv.test.vert.out b/Test/baseResults/spv.test.vert.out index 697e468d..623d16ba 100644 --- a/Test/baseResults/spv.test.vert.out +++ b/Test/baseResults/spv.test.vert.out @@ -1,10 +1,6 @@ spv.test.vert WARNING: 0:5: attribute deprecated in version 130; may be removed in future release - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 24 diff --git a/Test/baseResults/spv.texture.frag.out b/Test/baseResults/spv.texture.frag.out index 30f3f281..467f2545 100755 --- a/Test/baseResults/spv.texture.frag.out +++ b/Test/baseResults/spv.texture.frag.out @@ -3,10 +3,6 @@ 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 - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 305 diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out index cc3d3daa..c3615499 100755 --- a/Test/baseResults/spv.texture.vert.out +++ b/Test/baseResults/spv.texture.vert.out @@ -1,8 +1,4 @@ spv.texture.vert - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 150 diff --git a/Test/baseResults/spv.types.frag.out b/Test/baseResults/spv.types.frag.out index 4295370d..9a2d8e35 100755 --- a/Test/baseResults/spv.types.frag.out +++ b/Test/baseResults/spv.types.frag.out @@ -1,8 +1,4 @@ spv.types.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 260 diff --git a/Test/baseResults/spv.uint.frag.out b/Test/baseResults/spv.uint.frag.out index 6682e7c2..e9ba0ce2 100755 --- a/Test/baseResults/spv.uint.frag.out +++ b/Test/baseResults/spv.uint.frag.out @@ -1,10 +1,6 @@ spv.uint.frag Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 213 diff --git a/Test/baseResults/spv.uniformArray.frag.out b/Test/baseResults/spv.uniformArray.frag.out index e66eda6b..447ad4fd 100644 --- a/Test/baseResults/spv.uniformArray.frag.out +++ b/Test/baseResults/spv.uniformArray.frag.out @@ -1,8 +1,4 @@ spv.uniformArray.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 53 diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out index 1f8ee96a..b4d3fe01 100755 --- a/Test/baseResults/spv.variableArrayIndex.frag.out +++ b/Test/baseResults/spv.variableArrayIndex.frag.out @@ -1,10 +1,6 @@ spv.variableArrayIndex.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 93 diff --git a/Test/baseResults/spv.varyingArray.frag.out b/Test/baseResults/spv.varyingArray.frag.out index 4a7d2ee6..58833ea1 100755 --- a/Test/baseResults/spv.varyingArray.frag.out +++ b/Test/baseResults/spv.varyingArray.frag.out @@ -1,8 +1,4 @@ spv.varyingArray.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 61 diff --git a/Test/baseResults/spv.varyingArrayIndirect.frag.out b/Test/baseResults/spv.varyingArrayIndirect.frag.out index 410fd3c4..9c018406 100755 --- a/Test/baseResults/spv.varyingArrayIndirect.frag.out +++ b/Test/baseResults/spv.varyingArrayIndirect.frag.out @@ -1,8 +1,4 @@ spv.varyingArrayIndirect.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 70 diff --git a/Test/baseResults/spv.voidFunction.frag.out b/Test/baseResults/spv.voidFunction.frag.out index 1d4b694b..44348616 100755 --- a/Test/baseResults/spv.voidFunction.frag.out +++ b/Test/baseResults/spv.voidFunction.frag.out @@ -1,10 +1,6 @@ spv.voidFunction.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 2ec33102..73dc35ce 100644 --- a/Test/baseResults/spv.while-continue-break.vert.out +++ b/Test/baseResults/spv.while-continue-break.vert.out @@ -1,10 +1,6 @@ spv.while-continue-break.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // 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 0c1c8221..82121dd0 100755 --- a/Test/baseResults/spv.while-simple.vert.out +++ b/Test/baseResults/spv.while-simple.vert.out @@ -1,10 +1,6 @@ spv.while-simple.vert Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - -Linked vertex stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 22 diff --git a/Test/baseResults/spv.whileLoop.frag.out b/Test/baseResults/spv.whileLoop.frag.out index 8de5e956..ce1e195d 100755 --- a/Test/baseResults/spv.whileLoop.frag.out +++ b/Test/baseResults/spv.whileLoop.frag.out @@ -1,8 +1,4 @@ spv.whileLoop.frag - -Linked fragment stage: - - // Module Version 10000 // Generated by (magic number): 80001 // Id's are bound by 35 diff --git a/Test/baseResults/vulkan.comp.out b/Test/baseResults/vulkan.comp.out index 7f1fd18a..5eb4c5b4 100644 --- a/Test/baseResults/vulkan.comp.out +++ b/Test/baseResults/vulkan.comp.out @@ -4,8 +4,4 @@ ERROR: 0:5: 'local_size' : cannot change previously set size ERROR: 1 compilation errors. No code generated. - -Linked compute stage: - - SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/vulkan.frag.out b/Test/baseResults/vulkan.frag.out index d4da9190..1df2c3eb 100644 --- a/Test/baseResults/vulkan.frag.out +++ b/Test/baseResults/vulkan.frag.out @@ -43,9 +43,6 @@ ERROR: 0:94: 'call argument' : sampler constructor must appear at point of use ERROR: 38 compilation errors. No code generated. - -Linked fragment stage: - ERROR: Linking fragment stage: Only one push_constant block is allowed per stage SPIR-V is not generated for failed compile or link diff --git a/Test/baseResults/vulkan.vert.out b/Test/baseResults/vulkan.vert.out index 5aeaa74c..7111a2dc 100644 --- a/Test/baseResults/vulkan.vert.out +++ b/Test/baseResults/vulkan.vert.out @@ -26,8 +26,4 @@ ERROR: 0:39: 'set' : cannot be used with push_constant ERROR: 23 compilation errors. No code generated. - -Linked vertex stage: - - SPIR-V is not generated for failed compile or link diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 4b9e96e5..e4eb266c 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1670" +#define GLSLANG_REVISION "Overload400-PrecQual.1674" #define GLSLANG_DATE "03-Dec-2016" diff --git a/glslang/MachineIndependent/ShaderLang.cpp b/glslang/MachineIndependent/ShaderLang.cpp index ef459879..59c9a01c 100644 --- a/glslang/MachineIndependent/ShaderLang.cpp +++ b/glslang/MachineIndependent/ShaderLang.cpp @@ -1687,7 +1687,8 @@ bool TProgram::linkStage(EShLanguage stage, EShMessages messages) newedIntermediate[stage] = true; } - infoSink->info << "\nLinked " << StageName(stage) << " stage:\n\n"; + if (messages & EShMsgAST) + infoSink->info << "\nLinked " << StageName(stage) << " stage:\n\n"; if (stages[stage].size() > 1) { std::list::const_iterator it;