From 6626cadbadab08f456825e9e293ac848226f8198 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 19 Jun 2015 05:14:19 +0000 Subject: [PATCH] glslang front-end: Don't emit blank lines for empty info logs. From Andrew Woloszyn . git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31531 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- StandAlone/StandAlone.cpp | 23 +++++++++++++------ Test/baseResults/100Limits.vert.out | 1 - Test/baseResults/150.tesc.out | 1 - Test/baseResults/300link.frag.out | 1 - Test/baseResults/300link2.frag.out | 1 - Test/baseResults/300link3.frag.out | 1 - Test/baseResults/330comp.frag.out | 1 - Test/baseResults/Operations.frag.out | 1 - Test/baseResults/always-discard.frag.out | 1 - Test/baseResults/always-discard2.frag.out | 1 - Test/baseResults/conditionalDiscard.frag.out | 1 - Test/baseResults/conversion.frag.out | 1 - Test/baseResults/deepRvalue.frag.out | 1 - Test/baseResults/discard-dce.frag.out | 1 - Test/baseResults/doWhileLoop.frag.out | 1 - Test/baseResults/earlyReturnDiscard.frag.out | 1 - Test/baseResults/empty.frag.out | 3 --- Test/baseResults/flowControl.frag.out | 1 - Test/baseResults/forLoop.frag.out | 1 - Test/baseResults/forwardRef.frag.out | 1 - Test/baseResults/length.frag.out | 1 - Test/baseResults/link1.frag.out | 3 --- Test/baseResults/mains1.frag.out | 3 --- Test/baseResults/noMain.vert.out | 1 - Test/baseResults/nonSquare.vert.out | 1 - Test/baseResults/pointCoord.frag.out | 1 - Test/baseResults/prepost.frag.out | 1 - .../preprocessor.edge_cases.vert.out | 2 -- Test/baseResults/preprocessor.errors.vert.out | 2 -- .../preprocessor.extensions.vert.out | 2 -- .../preprocessor.function_macro.vert.out | 2 -- Test/baseResults/preprocessor.line.vert.out | 2 -- Test/baseResults/preprocessor.pragma.vert.out | 2 -- Test/baseResults/preprocessor.simple.vert.out | 2 -- Test/baseResults/recurse1.vert.out | 3 --- Test/baseResults/reflection.vert.out | 2 -- Test/baseResults/sample.frag.out | 1 - Test/baseResults/sample.vert.out | 1 - Test/baseResults/spv.100ops.frag.out | 3 --- Test/baseResults/spv.130.frag.out | 2 -- Test/baseResults/spv.140.frag.out | 3 --- Test/baseResults/spv.150.geom.out | 3 --- Test/baseResults/spv.150.vert.out | 3 --- Test/baseResults/spv.300BuiltIns.vert.out | 3 --- Test/baseResults/spv.300layout.frag.out | 3 --- Test/baseResults/spv.300layout.vert.out | 3 --- Test/baseResults/spv.300layoutp.vert.out | 3 --- Test/baseResults/spv.310.comp.out | 2 -- Test/baseResults/spv.330.geom.out | 3 --- 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.vert.out | 2 -- Test/baseResults/spv.Operations.frag.out | 3 --- Test/baseResults/spv.accessChain.frag.out | 2 -- Test/baseResults/spv.aggOps.frag.out | 2 -- Test/baseResults/spv.always-discard.frag.out | 3 --- Test/baseResults/spv.always-discard2.frag.out | 3 --- .../spv.conditionalDiscard.frag.out | 3 --- Test/baseResults/spv.conversion.frag.out | 3 --- Test/baseResults/spv.dataOut.frag.out | 2 -- Test/baseResults/spv.dataOutIndirect.frag.out | 2 -- Test/baseResults/spv.dataOutIndirect.vert.out | 2 -- Test/baseResults/spv.deepRvalue.frag.out | 3 --- Test/baseResults/spv.depthOut.frag.out | 2 -- Test/baseResults/spv.discard-dce.frag.out | 3 --- Test/baseResults/spv.do-simple.vert.out | 3 --- .../spv.do-while-continue-break.vert.out | 3 --- Test/baseResults/spv.doWhileLoop.frag.out | 3 --- Test/baseResults/spv.double.comp.out | 2 -- .../spv.earlyReturnDiscard.frag.out | 3 --- Test/baseResults/spv.flowControl.frag.out | 3 --- .../spv.for-continue-break.vert.out | 3 --- Test/baseResults/spv.for-simple.vert.out | 3 --- Test/baseResults/spv.forLoop.frag.out | 3 --- Test/baseResults/spv.forwardFun.frag.out | 3 --- Test/baseResults/spv.functionCall.frag.out | 2 -- .../spv.functionSemantics.frag.out | 2 -- Test/baseResults/spv.length.frag.out | 3 --- 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 | 3 --- Test/baseResults/spv.matrix.frag.out | 2 -- Test/baseResults/spv.matrix2.frag.out | 2 -- Test/baseResults/spv.newTexture.frag.out | 2 -- Test/baseResults/spv.nonSquare.vert.out | 3 --- Test/baseResults/spv.precision.frag.out | 3 --- Test/baseResults/spv.prepost.frag.out | 3 --- Test/baseResults/spv.qualifiers.vert.out | 2 -- Test/baseResults/spv.set.vert.out | 2 -- .../spv.simpleFunctionCall.frag.out | 2 -- Test/baseResults/spv.simpleMat.vert.out | 3 --- .../baseResults/spv.structAssignment.frag.out | 2 -- Test/baseResults/spv.structDeref.frag.out | 2 -- Test/baseResults/spv.structure.frag.out | 2 -- Test/baseResults/spv.switch.frag.out | 2 -- Test/baseResults/spv.swizzle.frag.out | 3 --- Test/baseResults/spv.test.frag.out | 3 --- Test/baseResults/spv.test.vert.out | 2 -- Test/baseResults/spv.texture.frag.out | 2 -- Test/baseResults/spv.texture.vert.out | 3 --- Test/baseResults/spv.types.frag.out | 3 --- Test/baseResults/spv.uint.frag.out | 3 --- Test/baseResults/spv.uniformArray.frag.out | 3 --- .../spv.variableArrayIndex.frag.out | 2 -- Test/baseResults/spv.varyingArray.frag.out | 2 -- .../spv.varyingArrayIndirect.frag.out | 2 -- Test/baseResults/spv.voidFunction.frag.out | 3 --- .../spv.while-continue-break.vert.out | 3 --- Test/baseResults/spv.while-simple.vert.out | 3 --- Test/baseResults/spv.whileLoop.frag.out | 3 --- Test/baseResults/swizzle.frag.out | 1 - Test/baseResults/test.frag.out | 1 - Test/baseResults/types.frag.out | 1 - Test/baseResults/uniformArray.frag.out | 1 - Test/baseResults/voidFunction.frag.out | 1 - Test/baseResults/whileLoop.frag.out | 1 - 119 files changed, 16 insertions(+), 257 deletions(-) diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 906dcbdf..8a09b19b 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -589,6 +589,15 @@ CompileShaders(void*) const char* GlslStd450DebugNames[GLSL_STD_450::Count]; +// Outputs the given string, but only if it is non-null and non-empty. +// This prevents erroneous newlines from appearing. +void puts_if_non_empty(const char* str) +{ + if (str && str[0]) { + puts(str); + } +} + // // For linking mode: Will independently parse each item in the worklist, but then put them // in the same program and link them together. @@ -635,9 +644,9 @@ void CompileAndLinkShaders() program.addShader(shader); if (! (Options & EOptionSuppressInfolog)) { - puts(workItem->name.c_str()); - puts(shader->getInfoLog()); - puts(shader->getInfoDebugLog()); + puts_if_non_empty(workItem->name.c_str()); + puts_if_non_empty(shader->getInfoLog()); + puts_if_non_empty(shader->getInfoDebugLog()); } FreeFileData(shaderStrings); @@ -651,8 +660,8 @@ void CompileAndLinkShaders() LinkFailed = true; if (! (Options & EOptionSuppressInfolog)) { - puts(program.getInfoLog()); - puts(program.getInfoDebugLog()); + puts_if_non_empty(program.getInfoLog()); + puts_if_non_empty(program.getInfoDebugLog()); } if (Options & EOptionDumpReflection) { @@ -760,8 +769,8 @@ int C_DECL main(int argc, char* argv[]) for (int w = 0; w < NumWorkItems; ++w) { if (Work[w]) { if (printShaderNames) - puts(Work[w]->name.c_str()); - puts(Work[w]->results.c_str()); + puts_if_non_empty(Work[w]->name.c_str()); + puts_if_non_empty(Work[w]->results.c_str()); delete Work[w]; } } diff --git a/Test/baseResults/100Limits.vert.out b/Test/baseResults/100Limits.vert.out index 9cda6bfe..eae74ce2 100644 --- a/Test/baseResults/100Limits.vert.out +++ b/Test/baseResults/100Limits.vert.out @@ -1,5 +1,4 @@ 100Limits.vert - Shader version: 100 0:? Sequence 0:15 Function Definition: foo(f1; (global void) diff --git a/Test/baseResults/150.tesc.out b/Test/baseResults/150.tesc.out index 5daa97d0..423a1e53 100644 --- a/Test/baseResults/150.tesc.out +++ b/Test/baseResults/150.tesc.out @@ -1,5 +1,4 @@ 150.tesc - Shader version: 150 Requested GL_ARB_tessellation_shader vertices = 4 diff --git a/Test/baseResults/300link.frag.out b/Test/baseResults/300link.frag.out index 4fbb16c0..3ed13534 100644 --- a/Test/baseResults/300link.frag.out +++ b/Test/baseResults/300link.frag.out @@ -1,5 +1,4 @@ 300link.frag - Shader version: 300 0:? Sequence 0:8 Function Definition: main( (global void) diff --git a/Test/baseResults/300link2.frag.out b/Test/baseResults/300link2.frag.out index e7261d66..156a967f 100644 --- a/Test/baseResults/300link2.frag.out +++ b/Test/baseResults/300link2.frag.out @@ -1,5 +1,4 @@ 300link2.frag - Shader version: 300 0:? Sequence 0:9 Function Definition: main( (global void) diff --git a/Test/baseResults/300link3.frag.out b/Test/baseResults/300link3.frag.out index a8a706b6..5fa6002a 100644 --- a/Test/baseResults/300link3.frag.out +++ b/Test/baseResults/300link3.frag.out @@ -1,5 +1,4 @@ 300link3.frag - Shader version: 300 0:? Sequence 0:7 Function Definition: main( (global void) diff --git a/Test/baseResults/330comp.frag.out b/Test/baseResults/330comp.frag.out index 3ed947f1..58d2e7c5 100644 --- a/Test/baseResults/330comp.frag.out +++ b/Test/baseResults/330comp.frag.out @@ -1,5 +1,4 @@ 330comp.frag - Shader version: 330 0:? Sequence 0:8 Function Definition: main( (global void) diff --git a/Test/baseResults/Operations.frag.out b/Test/baseResults/Operations.frag.out index c0a4d2d4..ce6a78ff 100644 --- a/Test/baseResults/Operations.frag.out +++ b/Test/baseResults/Operations.frag.out @@ -1,5 +1,4 @@ Operations.frag - Shader version: 130 0:? Sequence 0:15 Function Definition: main( (global void) diff --git a/Test/baseResults/always-discard.frag.out b/Test/baseResults/always-discard.frag.out index efd5d555..709c056c 100644 --- a/Test/baseResults/always-discard.frag.out +++ b/Test/baseResults/always-discard.frag.out @@ -1,5 +1,4 @@ always-discard.frag - Shader version: 110 0:? Sequence 0:4 Function Definition: main( (global void) diff --git a/Test/baseResults/always-discard2.frag.out b/Test/baseResults/always-discard2.frag.out index 27992c16..0fd1104d 100644 --- a/Test/baseResults/always-discard2.frag.out +++ b/Test/baseResults/always-discard2.frag.out @@ -1,5 +1,4 @@ always-discard2.frag - Shader version: 110 0:? Sequence 0:4 Function Definition: main( (global void) diff --git a/Test/baseResults/conditionalDiscard.frag.out b/Test/baseResults/conditionalDiscard.frag.out index 902093db..08fe7e34 100644 --- a/Test/baseResults/conditionalDiscard.frag.out +++ b/Test/baseResults/conditionalDiscard.frag.out @@ -1,5 +1,4 @@ conditionalDiscard.frag - Shader version: 110 0:? Sequence 0:6 Function Definition: main( (global void) diff --git a/Test/baseResults/conversion.frag.out b/Test/baseResults/conversion.frag.out index 24550835..c17195b9 100644 --- a/Test/baseResults/conversion.frag.out +++ b/Test/baseResults/conversion.frag.out @@ -1,5 +1,4 @@ conversion.frag - Shader version: 130 0:? Sequence 0:33 Function Definition: main( (global void) diff --git a/Test/baseResults/deepRvalue.frag.out b/Test/baseResults/deepRvalue.frag.out index 6640f25a..0363c863 100644 --- a/Test/baseResults/deepRvalue.frag.out +++ b/Test/baseResults/deepRvalue.frag.out @@ -1,5 +1,4 @@ deepRvalue.frag - Shader version: 120 0:? Sequence 0:5 Sequence diff --git a/Test/baseResults/discard-dce.frag.out b/Test/baseResults/discard-dce.frag.out index c7d09a4c..0a412f41 100644 --- a/Test/baseResults/discard-dce.frag.out +++ b/Test/baseResults/discard-dce.frag.out @@ -1,5 +1,4 @@ discard-dce.frag - Shader version: 110 0:? Sequence 0:4 Function Definition: main( (global void) diff --git a/Test/baseResults/doWhileLoop.frag.out b/Test/baseResults/doWhileLoop.frag.out index e89441a9..526df030 100644 --- a/Test/baseResults/doWhileLoop.frag.out +++ b/Test/baseResults/doWhileLoop.frag.out @@ -1,5 +1,4 @@ doWhileLoop.frag - Shader version: 110 0:? Sequence 0:7 Function Definition: main( (global void) diff --git a/Test/baseResults/earlyReturnDiscard.frag.out b/Test/baseResults/earlyReturnDiscard.frag.out index f3b63cd9..925e1683 100644 --- a/Test/baseResults/earlyReturnDiscard.frag.out +++ b/Test/baseResults/earlyReturnDiscard.frag.out @@ -1,5 +1,4 @@ earlyReturnDiscard.frag - Shader version: 110 0:? Sequence 0:19 Function Definition: main( (global void) diff --git a/Test/baseResults/empty.frag.out b/Test/baseResults/empty.frag.out index d431ff94..dadf0767 100644 --- a/Test/baseResults/empty.frag.out +++ b/Test/baseResults/empty.frag.out @@ -1,17 +1,14 @@ empty.frag - Shader version: 100 0:? Sequence 0:? Linker Objects empty2.frag - Shader version: 100 0:? Sequence 0:? Linker Objects empty3.frag - Shader version: 110 0:? Sequence 0:? Linker Objects diff --git a/Test/baseResults/flowControl.frag.out b/Test/baseResults/flowControl.frag.out index 91fa8502..ddeb8201 100644 --- a/Test/baseResults/flowControl.frag.out +++ b/Test/baseResults/flowControl.frag.out @@ -1,5 +1,4 @@ flowControl.frag - Shader version: 120 0:? Sequence 0:10 Function Definition: main( (global void) diff --git a/Test/baseResults/forLoop.frag.out b/Test/baseResults/forLoop.frag.out index 52d96ae5..ace2158e 100644 --- a/Test/baseResults/forLoop.frag.out +++ b/Test/baseResults/forLoop.frag.out @@ -1,5 +1,4 @@ forLoop.frag - Shader version: 130 0:? Sequence 0:10 Function Definition: main( (global void) diff --git a/Test/baseResults/forwardRef.frag.out b/Test/baseResults/forwardRef.frag.out index d435d259..a39ed204 100644 --- a/Test/baseResults/forwardRef.frag.out +++ b/Test/baseResults/forwardRef.frag.out @@ -1,5 +1,4 @@ forwardRef.frag - Shader version: 110 0:? Sequence 0:11 Function Definition: main( (global void) diff --git a/Test/baseResults/length.frag.out b/Test/baseResults/length.frag.out index 5f2182b3..8725a16e 100644 --- a/Test/baseResults/length.frag.out +++ b/Test/baseResults/length.frag.out @@ -1,5 +1,4 @@ length.frag - Shader version: 120 0:? Sequence 0:11 Function Definition: main( (global void) diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out index aa31c5f2..d5857838 100644 --- a/Test/baseResults/link1.frag.out +++ b/Test/baseResults/link1.frag.out @@ -1,5 +1,4 @@ link1.frag - Shader version: 130 0:? Sequence 0:8 Sequence @@ -80,7 +79,6 @@ Shader version: 130 0:? 3.900000 link2.frag - Shader version: 130 Requested GL_OES_standard_derivatives Requested GL_OES_texture_3D @@ -152,7 +150,6 @@ Requested GL_OES_texture_3D 0:? 3.900000 link3.frag - Shader version: 300 Requested GL_OES_EGL_image_external Requested GL_OES_standard_derivatives diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out index baf15df3..596b845b 100644 --- a/Test/baseResults/mains1.frag.out +++ b/Test/baseResults/mains1.frag.out @@ -1,5 +1,4 @@ mains1.frag - Shader version: 110 0:? Sequence 0:3 Function Definition: main( (global void) @@ -7,7 +6,6 @@ Shader version: 110 0:? Linker Objects mains2.frag - Shader version: 110 0:? Sequence 0:3 Function Definition: main( (global void) @@ -30,7 +28,6 @@ ERROR: node is still EOpNull! 0:? Linker Objects noMain2.geom - Shader version: 150 invocations = 0 max_vertices = 0 diff --git a/Test/baseResults/noMain.vert.out b/Test/baseResults/noMain.vert.out index 7403e1a5..052e27ed 100644 --- a/Test/baseResults/noMain.vert.out +++ b/Test/baseResults/noMain.vert.out @@ -1,5 +1,4 @@ noMain.vert - Shader version: 300 0:? Sequence 0:3 Function Definition: foo( (global void) diff --git a/Test/baseResults/nonSquare.vert.out b/Test/baseResults/nonSquare.vert.out index a34d034b..9f5c1006 100644 --- a/Test/baseResults/nonSquare.vert.out +++ b/Test/baseResults/nonSquare.vert.out @@ -1,5 +1,4 @@ nonSquare.vert - Shader version: 120 0:? Sequence 0:15 Function Definition: main( (global void) diff --git a/Test/baseResults/pointCoord.frag.out b/Test/baseResults/pointCoord.frag.out index cc5c5866..157eaa61 100644 --- a/Test/baseResults/pointCoord.frag.out +++ b/Test/baseResults/pointCoord.frag.out @@ -1,5 +1,4 @@ pointCoord.frag - Shader version: 100 0:? Sequence 0:5 Function Definition: main( (global void) diff --git a/Test/baseResults/prepost.frag.out b/Test/baseResults/prepost.frag.out index 581210c0..42769ff7 100644 --- a/Test/baseResults/prepost.frag.out +++ b/Test/baseResults/prepost.frag.out @@ -1,5 +1,4 @@ prepost.frag - Shader version: 140 0:? Sequence 0:3 Function Definition: main( (global void) diff --git a/Test/baseResults/preprocessor.edge_cases.vert.out b/Test/baseResults/preprocessor.edge_cases.vert.out index d667ca7e..9c51bc4e 100644 --- a/Test/baseResults/preprocessor.edge_cases.vert.out +++ b/Test/baseResults/preprocessor.edge_cases.vert.out @@ -14,5 +14,3 @@ void main(){ gl_Position = vec4(3 + 2 + 2 * 4 + 2 + 3 * 2); } - - diff --git a/Test/baseResults/preprocessor.errors.vert.out b/Test/baseResults/preprocessor.errors.vert.out index 409c16aa..e0cabb85 100644 --- a/Test/baseResults/preprocessor.errors.vert.out +++ b/Test/baseResults/preprocessor.errors.vert.out @@ -14,5 +14,3 @@ int main(){ } - - diff --git a/Test/baseResults/preprocessor.extensions.vert.out b/Test/baseResults/preprocessor.extensions.vert.out index 49d18047..a0cfb05a 100644 --- a/Test/baseResults/preprocessor.extensions.vert.out +++ b/Test/baseResults/preprocessor.extensions.vert.out @@ -10,5 +10,3 @@ int main(){ } - - diff --git a/Test/baseResults/preprocessor.function_macro.vert.out b/Test/baseResults/preprocessor.function_macro.vert.out index 340d71b0..9476784d 100644 --- a/Test/baseResults/preprocessor.function_macro.vert.out +++ b/Test/baseResults/preprocessor.function_macro.vert.out @@ -19,5 +19,3 @@ int main(){ gl_Position = vec4(4 + 3 + 3); } - - diff --git a/Test/baseResults/preprocessor.line.vert.out b/Test/baseResults/preprocessor.line.vert.out index a7742fc6..2893521b 100644 --- a/Test/baseResults/preprocessor.line.vert.out +++ b/Test/baseResults/preprocessor.line.vert.out @@ -22,5 +22,3 @@ void main(){ #line 1 - - diff --git a/Test/baseResults/preprocessor.pragma.vert.out b/Test/baseResults/preprocessor.pragma.vert.out index 22de1ced..62b6a134 100644 --- a/Test/baseResults/preprocessor.pragma.vert.out +++ b/Test/baseResults/preprocessor.pragma.vert.out @@ -10,5 +10,3 @@ int main(){ } - - diff --git a/Test/baseResults/preprocessor.simple.vert.out b/Test/baseResults/preprocessor.simple.vert.out index 8364576c..878fff75 100644 --- a/Test/baseResults/preprocessor.simple.vert.out +++ b/Test/baseResults/preprocessor.simple.vert.out @@ -21,5 +21,3 @@ int main(){ gl_Position = vec4(fn(3)); } - - diff --git a/Test/baseResults/recurse1.vert.out b/Test/baseResults/recurse1.vert.out index 0f9a0b3e..1b43ee16 100644 --- a/Test/baseResults/recurse1.vert.out +++ b/Test/baseResults/recurse1.vert.out @@ -1,5 +1,4 @@ recurse1.vert - Shader version: 330 0:? Sequence 0:3 Function Definition: main( (global void) @@ -69,7 +68,6 @@ Shader version: 330 0:? 'gl_InstanceID' (gl_InstanceId int InstanceId) recurse1.frag - Shader version: 330 0:? Sequence 0:5 Function Definition: main( (global void) @@ -157,7 +155,6 @@ Shader version: 330 0:? Linker Objects recurse2.frag - Shader version: 330 0:? Sequence 0:9 Function Definition: cbar(i1; (global float) diff --git a/Test/baseResults/reflection.vert.out b/Test/baseResults/reflection.vert.out index 0a74c147..cb01abef 100644 --- a/Test/baseResults/reflection.vert.out +++ b/Test/baseResults/reflection.vert.out @@ -2,11 +2,9 @@ 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 sampler_2D: offset -1, type 8b5e, size 1, index -1 diff --git a/Test/baseResults/sample.frag.out b/Test/baseResults/sample.frag.out index 00ac78e1..bfa6e5a0 100644 --- a/Test/baseResults/sample.frag.out +++ b/Test/baseResults/sample.frag.out @@ -1,5 +1,4 @@ sample.frag - Shader version: 110 0:? Sequence 0:38 Function Definition: main( (global void) diff --git a/Test/baseResults/sample.vert.out b/Test/baseResults/sample.vert.out index ff886f74..a2071e93 100644 --- a/Test/baseResults/sample.vert.out +++ b/Test/baseResults/sample.vert.out @@ -1,5 +1,4 @@ sample.vert - Shader version: 110 0:? Sequence 0:38 Function Definition: main( (global void) diff --git a/Test/baseResults/spv.100ops.frag.out b/Test/baseResults/spv.100ops.frag.out index c937419e..151535b0 100644 --- a/Test/baseResults/spv.100ops.frag.out +++ b/Test/baseResults/spv.100ops.frag.out @@ -1,11 +1,8 @@ spv.100ops.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 48 diff --git a/Test/baseResults/spv.130.frag.out b/Test/baseResults/spv.130.frag.out index 123a45b5..99ca6f17 100644 --- a/Test/baseResults/spv.130.frag.out +++ b/Test/baseResults/spv.130.frag.out @@ -2,9 +2,7 @@ spv.130.frag WARNING: 0:34: '#extension' : extension is only partially supported: GL_ARB_gpu_shader5 - Linked fragment stage: - Missing functionality: texture gather diff --git a/Test/baseResults/spv.140.frag.out b/Test/baseResults/spv.140.frag.out index 3c43631d..afcd6e0c 100644 --- a/Test/baseResults/spv.140.frag.out +++ b/Test/baseResults/spv.140.frag.out @@ -1,11 +1,8 @@ spv.140.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 90 diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out index b951524e..c3a9fe6e 100644 --- a/Test/baseResults/spv.150.geom.out +++ b/Test/baseResults/spv.150.geom.out @@ -1,11 +1,8 @@ spv.150.geom - - Linked geometry stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 72 diff --git a/Test/baseResults/spv.150.vert.out b/Test/baseResults/spv.150.vert.out index a40a4544..424ecc87 100644 --- a/Test/baseResults/spv.150.vert.out +++ b/Test/baseResults/spv.150.vert.out @@ -1,11 +1,8 @@ spv.150.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 53 diff --git a/Test/baseResults/spv.300BuiltIns.vert.out b/Test/baseResults/spv.300BuiltIns.vert.out index 13edf06b..1e61e9ac 100644 --- a/Test/baseResults/spv.300BuiltIns.vert.out +++ b/Test/baseResults/spv.300BuiltIns.vert.out @@ -1,11 +1,8 @@ spv.300BuiltIns.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 41 diff --git a/Test/baseResults/spv.300layout.frag.out b/Test/baseResults/spv.300layout.frag.out index 5e2f6995..678ceeca 100644 --- a/Test/baseResults/spv.300layout.frag.out +++ b/Test/baseResults/spv.300layout.frag.out @@ -1,11 +1,8 @@ spv.300layout.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 38 diff --git a/Test/baseResults/spv.300layout.vert.out b/Test/baseResults/spv.300layout.vert.out index 348ee707..f9964497 100644 --- a/Test/baseResults/spv.300layout.vert.out +++ b/Test/baseResults/spv.300layout.vert.out @@ -1,9 +1,6 @@ spv.300layout.vert - - Linked vertex stage: - Missing functionality: binary operation on matrix diff --git a/Test/baseResults/spv.300layoutp.vert.out b/Test/baseResults/spv.300layoutp.vert.out index c7d9882f..5a813b86 100644 --- a/Test/baseResults/spv.300layoutp.vert.out +++ b/Test/baseResults/spv.300layoutp.vert.out @@ -1,11 +1,8 @@ spv.300layoutp.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 112 diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out index b12580b0..d1f8a9ae 100644 --- a/Test/baseResults/spv.310.comp.out +++ b/Test/baseResults/spv.310.comp.out @@ -2,9 +2,7 @@ spv.310.comp Warning, version 310 is not yet complete; most version-specific features are present, but some are missing. - Linked compute stage: - Missing functionality: Unsized array diff --git a/Test/baseResults/spv.330.geom.out b/Test/baseResults/spv.330.geom.out index ae4e043d..24c938e9 100644 --- a/Test/baseResults/spv.330.geom.out +++ b/Test/baseResults/spv.330.geom.out @@ -1,11 +1,8 @@ spv.330.geom - - Linked geometry stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 33 diff --git a/Test/baseResults/spv.400.frag.out b/Test/baseResults/spv.400.frag.out index 9e98d2ce..2024d533 100644 --- a/Test/baseResults/spv.400.frag.out +++ b/Test/baseResults/spv.400.frag.out @@ -2,9 +2,7 @@ spv.400.frag Warning, version 400 is not yet complete; most version-specific features are present, but some are missing. - Linked fragment stage: - Missing functionality: texture gather diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out index ac08a2b9..56ece6d5 100644 --- a/Test/baseResults/spv.400.tesc.out +++ b/Test/baseResults/spv.400.tesc.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 89 diff --git a/Test/baseResults/spv.400.tese.out b/Test/baseResults/spv.400.tese.out index d16eb8e2..5bcd393d 100644 --- a/Test/baseResults/spv.400.tese.out +++ b/Test/baseResults/spv.400.tese.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 99 diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out index ba12e9eb..8a0ecf32 100644 --- a/Test/baseResults/spv.420.geom.out +++ b/Test/baseResults/spv.420.geom.out @@ -2,9 +2,7 @@ spv.420.geom Warning, version 420 is not yet complete; most version-specific features are present, but some are missing. - Linked geometry stage: - Missing functionality: texture gather diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out index d67e8faf..5a556cf5 100644 --- a/Test/baseResults/spv.430.vert.out +++ b/Test/baseResults/spv.430.vert.out @@ -2,11 +2,9 @@ spv.430.vert Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 62 diff --git a/Test/baseResults/spv.Operations.frag.out b/Test/baseResults/spv.Operations.frag.out index 8cddbd79..38ddcd9e 100644 --- a/Test/baseResults/spv.Operations.frag.out +++ b/Test/baseResults/spv.Operations.frag.out @@ -1,11 +1,8 @@ spv.Operations.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 399 diff --git a/Test/baseResults/spv.accessChain.frag.out b/Test/baseResults/spv.accessChain.frag.out index 1c72b8a7..fc3a321c 100644 --- a/Test/baseResults/spv.accessChain.frag.out +++ b/Test/baseResults/spv.accessChain.frag.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 198 diff --git a/Test/baseResults/spv.aggOps.frag.out b/Test/baseResults/spv.aggOps.frag.out index 51d4d608..b92d93c9 100644 --- a/Test/baseResults/spv.aggOps.frag.out +++ b/Test/baseResults/spv.aggOps.frag.out @@ -3,9 +3,7 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas WARNING: 0:6: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - Missing functionality: Composite comparison of non-vectors diff --git a/Test/baseResults/spv.always-discard.frag.out b/Test/baseResults/spv.always-discard.frag.out index 01a2239f..b57b543c 100644 --- a/Test/baseResults/spv.always-discard.frag.out +++ b/Test/baseResults/spv.always-discard.frag.out @@ -1,11 +1,8 @@ spv.always-discard.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 81 diff --git a/Test/baseResults/spv.always-discard2.frag.out b/Test/baseResults/spv.always-discard2.frag.out index c4096b0a..06cc5433 100644 --- a/Test/baseResults/spv.always-discard2.frag.out +++ b/Test/baseResults/spv.always-discard2.frag.out @@ -1,11 +1,8 @@ spv.always-discard2.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 37 diff --git a/Test/baseResults/spv.conditionalDiscard.frag.out b/Test/baseResults/spv.conditionalDiscard.frag.out index f66685f2..ea21a72b 100644 --- a/Test/baseResults/spv.conditionalDiscard.frag.out +++ b/Test/baseResults/spv.conditionalDiscard.frag.out @@ -1,11 +1,8 @@ spv.conditionalDiscard.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 36 diff --git a/Test/baseResults/spv.conversion.frag.out b/Test/baseResults/spv.conversion.frag.out index dd1679af..f8ba2cd5 100644 --- a/Test/baseResults/spv.conversion.frag.out +++ b/Test/baseResults/spv.conversion.frag.out @@ -1,11 +1,8 @@ spv.conversion.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 444 diff --git a/Test/baseResults/spv.dataOut.frag.out b/Test/baseResults/spv.dataOut.frag.out index f33acd74..fee2eef2 100644 --- a/Test/baseResults/spv.dataOut.frag.out +++ b/Test/baseResults/spv.dataOut.frag.out @@ -2,11 +2,9 @@ spv.dataOut.frag WARNING: 0:3: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 21 diff --git a/Test/baseResults/spv.dataOutIndirect.frag.out b/Test/baseResults/spv.dataOutIndirect.frag.out index 62b9d549..7a75b6d6 100644 --- a/Test/baseResults/spv.dataOutIndirect.frag.out +++ b/Test/baseResults/spv.dataOutIndirect.frag.out @@ -2,11 +2,9 @@ spv.dataOutIndirect.frag WARNING: 0:3: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 23 diff --git a/Test/baseResults/spv.dataOutIndirect.vert.out b/Test/baseResults/spv.dataOutIndirect.vert.out index 8c39498b..36b43c4c 100644 --- a/Test/baseResults/spv.dataOutIndirect.vert.out +++ b/Test/baseResults/spv.dataOutIndirect.vert.out @@ -3,11 +3,9 @@ WARNING: 0:3: attribute deprecated in version 130; may be removed in future rele WARNING: 0:4: varying deprecated in version 130; may be removed in future release - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 39 diff --git a/Test/baseResults/spv.deepRvalue.frag.out b/Test/baseResults/spv.deepRvalue.frag.out index 5d6d1318..1ed66811 100644 --- a/Test/baseResults/spv.deepRvalue.frag.out +++ b/Test/baseResults/spv.deepRvalue.frag.out @@ -1,9 +1,6 @@ spv.deepRvalue.frag - - Linked fragment stage: - Missing functionality: binary operation on matrix diff --git a/Test/baseResults/spv.depthOut.frag.out b/Test/baseResults/spv.depthOut.frag.out index f8e09ce5..211ab142 100644 --- a/Test/baseResults/spv.depthOut.frag.out +++ b/Test/baseResults/spv.depthOut.frag.out @@ -3,11 +3,9 @@ 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 - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 19 diff --git a/Test/baseResults/spv.discard-dce.frag.out b/Test/baseResults/spv.discard-dce.frag.out index d90eb115..366b5bc0 100644 --- a/Test/baseResults/spv.discard-dce.frag.out +++ b/Test/baseResults/spv.discard-dce.frag.out @@ -1,11 +1,8 @@ spv.discard-dce.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 81 diff --git a/Test/baseResults/spv.do-simple.vert.out b/Test/baseResults/spv.do-simple.vert.out index e376b822..321d0e00 100644 --- a/Test/baseResults/spv.do-simple.vert.out +++ b/Test/baseResults/spv.do-simple.vert.out @@ -1,11 +1,8 @@ spv.do-simple.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 26 diff --git a/Test/baseResults/spv.do-while-continue-break.vert.out b/Test/baseResults/spv.do-while-continue-break.vert.out index e9d45265..5fb34db8 100644 --- a/Test/baseResults/spv.do-while-continue-break.vert.out +++ b/Test/baseResults/spv.do-while-continue-break.vert.out @@ -1,11 +1,8 @@ spv.do-while-continue-break.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 48 diff --git a/Test/baseResults/spv.doWhileLoop.frag.out b/Test/baseResults/spv.doWhileLoop.frag.out index 62bf5b1b..18783bad 100644 --- a/Test/baseResults/spv.doWhileLoop.frag.out +++ b/Test/baseResults/spv.doWhileLoop.frag.out @@ -1,11 +1,8 @@ spv.doWhileLoop.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 34 diff --git a/Test/baseResults/spv.double.comp.out b/Test/baseResults/spv.double.comp.out index d8305334..6e118257 100644 --- a/Test/baseResults/spv.double.comp.out +++ b/Test/baseResults/spv.double.comp.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 63 diff --git a/Test/baseResults/spv.earlyReturnDiscard.frag.out b/Test/baseResults/spv.earlyReturnDiscard.frag.out index 9669e10f..bb61deb9 100644 --- a/Test/baseResults/spv.earlyReturnDiscard.frag.out +++ b/Test/baseResults/spv.earlyReturnDiscard.frag.out @@ -1,11 +1,8 @@ spv.earlyReturnDiscard.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 112 diff --git a/Test/baseResults/spv.flowControl.frag.out b/Test/baseResults/spv.flowControl.frag.out index e8d0395a..982f2823 100644 --- a/Test/baseResults/spv.flowControl.frag.out +++ b/Test/baseResults/spv.flowControl.frag.out @@ -1,11 +1,8 @@ spv.flowControl.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 42 diff --git a/Test/baseResults/spv.for-continue-break.vert.out b/Test/baseResults/spv.for-continue-break.vert.out index 8df0a082..a1a0ae1e 100644 --- a/Test/baseResults/spv.for-continue-break.vert.out +++ b/Test/baseResults/spv.for-continue-break.vert.out @@ -1,11 +1,8 @@ spv.for-continue-break.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 49 diff --git a/Test/baseResults/spv.for-simple.vert.out b/Test/baseResults/spv.for-simple.vert.out index 180805a7..10049450 100644 --- a/Test/baseResults/spv.for-simple.vert.out +++ b/Test/baseResults/spv.for-simple.vert.out @@ -1,11 +1,8 @@ spv.for-simple.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 26 diff --git a/Test/baseResults/spv.forLoop.frag.out b/Test/baseResults/spv.forLoop.frag.out index 85360ca2..ccf05b14 100644 --- a/Test/baseResults/spv.forLoop.frag.out +++ b/Test/baseResults/spv.forLoop.frag.out @@ -1,11 +1,8 @@ spv.forLoop.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 123 diff --git a/Test/baseResults/spv.forwardFun.frag.out b/Test/baseResults/spv.forwardFun.frag.out index 2be58e19..a4781e34 100644 --- a/Test/baseResults/spv.forwardFun.frag.out +++ b/Test/baseResults/spv.forwardFun.frag.out @@ -1,11 +1,8 @@ spv.forwardFun.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 59 diff --git a/Test/baseResults/spv.functionCall.frag.out b/Test/baseResults/spv.functionCall.frag.out index a8bb6c2e..1d7aa74c 100644 --- a/Test/baseResults/spv.functionCall.frag.out +++ b/Test/baseResults/spv.functionCall.frag.out @@ -2,11 +2,9 @@ spv.functionCall.frag WARNING: 0:4: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 76 diff --git a/Test/baseResults/spv.functionSemantics.frag.out b/Test/baseResults/spv.functionSemantics.frag.out index c86bb8e8..3eafe327 100644 --- a/Test/baseResults/spv.functionSemantics.frag.out +++ b/Test/baseResults/spv.functionSemantics.frag.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 159 diff --git a/Test/baseResults/spv.length.frag.out b/Test/baseResults/spv.length.frag.out index 2f4db556..8de3e4bd 100644 --- a/Test/baseResults/spv.length.frag.out +++ b/Test/baseResults/spv.length.frag.out @@ -1,11 +1,8 @@ spv.length.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 34 diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out index 184b24ce..97f358b8 100644 --- a/Test/baseResults/spv.localAggregates.frag.out +++ b/Test/baseResults/spv.localAggregates.frag.out @@ -3,11 +3,9 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas WARNING: 0:5: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 134 diff --git a/Test/baseResults/spv.loops.frag.out b/Test/baseResults/spv.loops.frag.out index a0cfef78..750e11d3 100644 --- a/Test/baseResults/spv.loops.frag.out +++ b/Test/baseResults/spv.loops.frag.out @@ -2,11 +2,9 @@ spv.loops.frag WARNING: 0:14: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 737 diff --git a/Test/baseResults/spv.loopsArtificial.frag.out b/Test/baseResults/spv.loopsArtificial.frag.out index 7aef1ae8..768571cf 100644 --- a/Test/baseResults/spv.loopsArtificial.frag.out +++ b/Test/baseResults/spv.loopsArtificial.frag.out @@ -2,11 +2,9 @@ spv.loopsArtificial.frag WARNING: 0:14: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 192 diff --git a/Test/baseResults/spv.matFun.vert.out b/Test/baseResults/spv.matFun.vert.out index 2a0a0fc9..cebf02aa 100644 --- a/Test/baseResults/spv.matFun.vert.out +++ b/Test/baseResults/spv.matFun.vert.out @@ -1,11 +1,8 @@ spv.matFun.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 94 diff --git a/Test/baseResults/spv.matrix.frag.out b/Test/baseResults/spv.matrix.frag.out index cec418da..ef7f0b03 100644 --- a/Test/baseResults/spv.matrix.frag.out +++ b/Test/baseResults/spv.matrix.frag.out @@ -4,9 +4,7 @@ WARNING: 0:17: varying deprecated in version 130; may be removed in future relea WARNING: 0:22: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - Missing functionality: Composite comparison of non-vectors diff --git a/Test/baseResults/spv.matrix2.frag.out b/Test/baseResults/spv.matrix2.frag.out index c40b01cc..8e961fac 100644 --- a/Test/baseResults/spv.matrix2.frag.out +++ b/Test/baseResults/spv.matrix2.frag.out @@ -4,9 +4,7 @@ WARNING: 0:13: varying deprecated in version 130; may be removed in future relea WARNING: 0:15: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - Missing functionality: binary operation on matrix diff --git a/Test/baseResults/spv.newTexture.frag.out b/Test/baseResults/spv.newTexture.frag.out index 1962e1a0..a4e375db 100644 --- a/Test/baseResults/spv.newTexture.frag.out +++ b/Test/baseResults/spv.newTexture.frag.out @@ -2,9 +2,7 @@ spv.newTexture.frag Warning, version 430 is not yet complete; most version-specific features are present, but some are missing. - Linked fragment stage: - Missing functionality: texel fetch diff --git a/Test/baseResults/spv.nonSquare.vert.out b/Test/baseResults/spv.nonSquare.vert.out index 969e63a3..94fe8cbb 100644 --- a/Test/baseResults/spv.nonSquare.vert.out +++ b/Test/baseResults/spv.nonSquare.vert.out @@ -1,11 +1,8 @@ spv.nonSquare.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 91 diff --git a/Test/baseResults/spv.precision.frag.out b/Test/baseResults/spv.precision.frag.out index 5ba1a5f7..fdbe7e45 100644 --- a/Test/baseResults/spv.precision.frag.out +++ b/Test/baseResults/spv.precision.frag.out @@ -1,11 +1,8 @@ spv.precision.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 111 diff --git a/Test/baseResults/spv.prepost.frag.out b/Test/baseResults/spv.prepost.frag.out index a9031e3e..e9ac5ca4 100644 --- a/Test/baseResults/spv.prepost.frag.out +++ b/Test/baseResults/spv.prepost.frag.out @@ -1,11 +1,8 @@ spv.prepost.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 97 diff --git a/Test/baseResults/spv.qualifiers.vert.out b/Test/baseResults/spv.qualifiers.vert.out index 1df120fb..df8063a4 100644 --- a/Test/baseResults/spv.qualifiers.vert.out +++ b/Test/baseResults/spv.qualifiers.vert.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 26 diff --git a/Test/baseResults/spv.set.vert.out b/Test/baseResults/spv.set.vert.out index 7a18683d..b968d676 100644 --- a/Test/baseResults/spv.set.vert.out +++ b/Test/baseResults/spv.set.vert.out @@ -2,11 +2,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 25 diff --git a/Test/baseResults/spv.simpleFunctionCall.frag.out b/Test/baseResults/spv.simpleFunctionCall.frag.out index 82a25023..35c6dfb2 100644 --- a/Test/baseResults/spv.simpleFunctionCall.frag.out +++ b/Test/baseResults/spv.simpleFunctionCall.frag.out @@ -2,11 +2,9 @@ spv.simpleFunctionCall.frag WARNING: 0:4: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 23 diff --git a/Test/baseResults/spv.simpleMat.vert.out b/Test/baseResults/spv.simpleMat.vert.out index 3dcf879d..8b16d764 100644 --- a/Test/baseResults/spv.simpleMat.vert.out +++ b/Test/baseResults/spv.simpleMat.vert.out @@ -1,11 +1,8 @@ spv.simpleMat.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 44 diff --git a/Test/baseResults/spv.structAssignment.frag.out b/Test/baseResults/spv.structAssignment.frag.out index d8a6a4e9..d41f57ba 100644 --- a/Test/baseResults/spv.structAssignment.frag.out +++ b/Test/baseResults/spv.structAssignment.frag.out @@ -2,11 +2,9 @@ spv.structAssignment.frag WARNING: 0:4: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 50 diff --git a/Test/baseResults/spv.structDeref.frag.out b/Test/baseResults/spv.structDeref.frag.out index 4e58adcc..840f08ca 100644 --- a/Test/baseResults/spv.structDeref.frag.out +++ b/Test/baseResults/spv.structDeref.frag.out @@ -2,11 +2,9 @@ spv.structDeref.frag WARNING: 0:4: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 120 diff --git a/Test/baseResults/spv.structure.frag.out b/Test/baseResults/spv.structure.frag.out index 727187d7..3c1053e1 100644 --- a/Test/baseResults/spv.structure.frag.out +++ b/Test/baseResults/spv.structure.frag.out @@ -2,11 +2,9 @@ spv.structure.frag WARNING: 0:3: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 61 diff --git a/Test/baseResults/spv.switch.frag.out b/Test/baseResults/spv.switch.frag.out index cc527af2..9ae9790d 100644 --- a/Test/baseResults/spv.switch.frag.out +++ b/Test/baseResults/spv.switch.frag.out @@ -4,11 +4,9 @@ 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 99 // Generated by (magic number): 51a00bb // Id's are bound by 261 diff --git a/Test/baseResults/spv.swizzle.frag.out b/Test/baseResults/spv.swizzle.frag.out index c9a6a2c8..e39c88c0 100644 --- a/Test/baseResults/spv.swizzle.frag.out +++ b/Test/baseResults/spv.swizzle.frag.out @@ -1,11 +1,8 @@ spv.swizzle.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 112 diff --git a/Test/baseResults/spv.test.frag.out b/Test/baseResults/spv.test.frag.out index 8ebb946d..6176f3cb 100644 --- a/Test/baseResults/spv.test.frag.out +++ b/Test/baseResults/spv.test.frag.out @@ -1,11 +1,8 @@ spv.test.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 54 diff --git a/Test/baseResults/spv.test.vert.out b/Test/baseResults/spv.test.vert.out index efd30d70..465b63f3 100644 --- a/Test/baseResults/spv.test.vert.out +++ b/Test/baseResults/spv.test.vert.out @@ -2,9 +2,7 @@ spv.test.vert WARNING: 0:5: attribute deprecated in version 130; may be removed in future release - Linked vertex stage: - Missing functionality: ftransform() diff --git a/Test/baseResults/spv.texture.frag.out b/Test/baseResults/spv.texture.frag.out index f3f6da35..ab5146f8 100644 --- a/Test/baseResults/spv.texture.frag.out +++ b/Test/baseResults/spv.texture.frag.out @@ -3,9 +3,7 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea WARNING: 0:15: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - Missing functionality: texel fetch diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out index ed87334b..cf62bc12 100644 --- a/Test/baseResults/spv.texture.vert.out +++ b/Test/baseResults/spv.texture.vert.out @@ -1,11 +1,8 @@ spv.texture.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 132 diff --git a/Test/baseResults/spv.types.frag.out b/Test/baseResults/spv.types.frag.out index b33a37bd..f2718e71 100644 --- a/Test/baseResults/spv.types.frag.out +++ b/Test/baseResults/spv.types.frag.out @@ -1,11 +1,8 @@ spv.types.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 264 diff --git a/Test/baseResults/spv.uint.frag.out b/Test/baseResults/spv.uint.frag.out index eb7f4adb..e7294a03 100644 --- a/Test/baseResults/spv.uint.frag.out +++ b/Test/baseResults/spv.uint.frag.out @@ -1,11 +1,8 @@ spv.uint.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 206 diff --git a/Test/baseResults/spv.uniformArray.frag.out b/Test/baseResults/spv.uniformArray.frag.out index 62d88f82..dc3ae722 100644 --- a/Test/baseResults/spv.uniformArray.frag.out +++ b/Test/baseResults/spv.uniformArray.frag.out @@ -1,11 +1,8 @@ spv.uniformArray.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 52 diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out index ab7ac624..7dc740a9 100644 --- a/Test/baseResults/spv.variableArrayIndex.frag.out +++ b/Test/baseResults/spv.variableArrayIndex.frag.out @@ -2,11 +2,9 @@ spv.variableArrayIndex.frag WARNING: 0:3: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 93 diff --git a/Test/baseResults/spv.varyingArray.frag.out b/Test/baseResults/spv.varyingArray.frag.out index f904a474..0f20e668 100644 --- a/Test/baseResults/spv.varyingArray.frag.out +++ b/Test/baseResults/spv.varyingArray.frag.out @@ -5,11 +5,9 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas WARNING: 0:8: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 61 diff --git a/Test/baseResults/spv.varyingArrayIndirect.frag.out b/Test/baseResults/spv.varyingArrayIndirect.frag.out index c147e865..54c37639 100644 --- a/Test/baseResults/spv.varyingArrayIndirect.frag.out +++ b/Test/baseResults/spv.varyingArrayIndirect.frag.out @@ -5,11 +5,9 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas WARNING: 0:8: varying deprecated in version 130; may be removed in future release - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 69 diff --git a/Test/baseResults/spv.voidFunction.frag.out b/Test/baseResults/spv.voidFunction.frag.out index 430ba7e6..cad7fe7c 100644 --- a/Test/baseResults/spv.voidFunction.frag.out +++ b/Test/baseResults/spv.voidFunction.frag.out @@ -1,11 +1,8 @@ spv.voidFunction.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // 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 9d4d3bb0..21c52960 100644 --- a/Test/baseResults/spv.while-continue-break.vert.out +++ b/Test/baseResults/spv.while-continue-break.vert.out @@ -1,11 +1,8 @@ spv.while-continue-break.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 43 diff --git a/Test/baseResults/spv.while-simple.vert.out b/Test/baseResults/spv.while-simple.vert.out index 8f35aa1a..93bb1450 100644 --- a/Test/baseResults/spv.while-simple.vert.out +++ b/Test/baseResults/spv.while-simple.vert.out @@ -1,11 +1,8 @@ spv.while-simple.vert - - Linked vertex stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 24 diff --git a/Test/baseResults/spv.whileLoop.frag.out b/Test/baseResults/spv.whileLoop.frag.out index d448c158..6eb3fdcc 100644 --- a/Test/baseResults/spv.whileLoop.frag.out +++ b/Test/baseResults/spv.whileLoop.frag.out @@ -1,11 +1,8 @@ spv.whileLoop.frag - - Linked fragment stage: - // Module Version 99 // Generated by (magic number): 51a00bb // Id's are bound by 32 diff --git a/Test/baseResults/swizzle.frag.out b/Test/baseResults/swizzle.frag.out index d706c6c8..eddb2fbe 100644 --- a/Test/baseResults/swizzle.frag.out +++ b/Test/baseResults/swizzle.frag.out @@ -1,5 +1,4 @@ swizzle.frag - Shader version: 110 0:? Sequence 0:9 Function Definition: main( (global void) diff --git a/Test/baseResults/test.frag.out b/Test/baseResults/test.frag.out index 4fd96c2e..da62bea4 100644 --- a/Test/baseResults/test.frag.out +++ b/Test/baseResults/test.frag.out @@ -1,5 +1,4 @@ test.frag - Shader version: 110 0:? Sequence 0:13 Function Definition: main( (global void) diff --git a/Test/baseResults/types.frag.out b/Test/baseResults/types.frag.out index fb52b1a4..e55c591c 100644 --- a/Test/baseResults/types.frag.out +++ b/Test/baseResults/types.frag.out @@ -1,5 +1,4 @@ types.frag - Shader version: 130 0:? Sequence 0:33 Function Definition: main( (global void) diff --git a/Test/baseResults/uniformArray.frag.out b/Test/baseResults/uniformArray.frag.out index 6c70af8e..f2f0901a 100644 --- a/Test/baseResults/uniformArray.frag.out +++ b/Test/baseResults/uniformArray.frag.out @@ -1,5 +1,4 @@ uniformArray.frag - Shader version: 130 0:? Sequence 0:7 Function Definition: main( (global void) diff --git a/Test/baseResults/voidFunction.frag.out b/Test/baseResults/voidFunction.frag.out index 342119d0..3124ab25 100644 --- a/Test/baseResults/voidFunction.frag.out +++ b/Test/baseResults/voidFunction.frag.out @@ -1,5 +1,4 @@ voidFunction.frag - Shader version: 120 0:? Sequence 0:7 Sequence diff --git a/Test/baseResults/whileLoop.frag.out b/Test/baseResults/whileLoop.frag.out index 5147bff1..87d3af7b 100644 --- a/Test/baseResults/whileLoop.frag.out +++ b/Test/baseResults/whileLoop.frag.out @@ -1,5 +1,4 @@ whileLoop.frag - Shader version: 110 0:? Sequence 0:7 Function Definition: main( (global void)