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

diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp
index 906dcbd..8a09b19 100644 (file)
--- 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 9cda6bf..eae74ce 100644 (file)
--- a/Test/baseResults/100Limits.vert.out
+++ b/Test/baseResults/100Limits.vert.out
@@ -1,5 +1,4 @@
 100Limits.vert\r
-\r
 Shader version: 100\r
 0:? Sequence\r
 0:15  Function Definition: foo(f1; (global void)\r

diff --git a/Test/baseResults/150.tesc.out b/Test/baseResults/150.tesc.out
index 5daa97d..423a1e5 100644 (file)
--- a/Test/baseResults/150.tesc.out
+++ b/Test/baseResults/150.tesc.out
@@ -1,5 +1,4 @@
 150.tesc\r
-\r
 Shader version: 150\r
 Requested GL_ARB_tessellation_shader\r
 vertices = 4\r

diff --git a/Test/baseResults/300link.frag.out b/Test/baseResults/300link.frag.out
index 4fbb16c..3ed1353 100644 (file)
--- a/Test/baseResults/300link.frag.out
+++ b/Test/baseResults/300link.frag.out
@@ -1,5 +1,4 @@
 300link.frag\r
-\r
 Shader version: 300\r
 0:? Sequence\r
 0:8  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/300link2.frag.out b/Test/baseResults/300link2.frag.out
index e7261d6..156a967 100644 (file)
--- a/Test/baseResults/300link2.frag.out
+++ b/Test/baseResults/300link2.frag.out
@@ -1,5 +1,4 @@
 300link2.frag\r
-\r
 Shader version: 300\r
 0:? Sequence\r
 0:9  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/300link3.frag.out b/Test/baseResults/300link3.frag.out
index a8a706b..5fa6002 100644 (file)
--- a/Test/baseResults/300link3.frag.out
+++ b/Test/baseResults/300link3.frag.out
@@ -1,5 +1,4 @@
 300link3.frag\r
-\r
 Shader version: 300\r
 0:? Sequence\r
 0:7  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/330comp.frag.out b/Test/baseResults/330comp.frag.out
index 3ed947f..58d2e7c 100644 (file)
--- a/Test/baseResults/330comp.frag.out
+++ b/Test/baseResults/330comp.frag.out
@@ -1,5 +1,4 @@
 330comp.frag\r
-\r
 Shader version: 330\r
 0:? Sequence\r
 0:8  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/Operations.frag.out b/Test/baseResults/Operations.frag.out
index c0a4d2d..ce6a78f 100644 (file)
--- a/Test/baseResults/Operations.frag.out
+++ b/Test/baseResults/Operations.frag.out
@@ -1,5 +1,4 @@
 Operations.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:15  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/always-discard.frag.out b/Test/baseResults/always-discard.frag.out
index efd5d55..709c056 100644 (file)
--- a/Test/baseResults/always-discard.frag.out
+++ b/Test/baseResults/always-discard.frag.out
@@ -1,5 +1,4 @@
 always-discard.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/always-discard2.frag.out b/Test/baseResults/always-discard2.frag.out
index 27992c1..0fd1104 100644 (file)
--- a/Test/baseResults/always-discard2.frag.out
+++ b/Test/baseResults/always-discard2.frag.out
@@ -1,5 +1,4 @@
 always-discard2.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/conditionalDiscard.frag.out b/Test/baseResults/conditionalDiscard.frag.out
index 902093d..08fe7e3 100644 (file)
--- a/Test/baseResults/conditionalDiscard.frag.out
+++ b/Test/baseResults/conditionalDiscard.frag.out
@@ -1,5 +1,4 @@
 conditionalDiscard.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:6  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/conversion.frag.out b/Test/baseResults/conversion.frag.out
index 2455083..c17195b 100644 (file)
--- a/Test/baseResults/conversion.frag.out
+++ b/Test/baseResults/conversion.frag.out
@@ -1,5 +1,4 @@
 conversion.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:33  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/deepRvalue.frag.out b/Test/baseResults/deepRvalue.frag.out
index 6640f25..0363c86 100644 (file)
--- a/Test/baseResults/deepRvalue.frag.out
+++ b/Test/baseResults/deepRvalue.frag.out
@@ -1,5 +1,4 @@
 deepRvalue.frag\r
-\r
 Shader version: 120\r
 0:? Sequence\r
 0:5  Sequence\r

diff --git a/Test/baseResults/discard-dce.frag.out b/Test/baseResults/discard-dce.frag.out
index c7d09a4..0a412f4 100644 (file)
--- a/Test/baseResults/discard-dce.frag.out
+++ b/Test/baseResults/discard-dce.frag.out
@@ -1,5 +1,4 @@
 discard-dce.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:4  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/doWhileLoop.frag.out b/Test/baseResults/doWhileLoop.frag.out
index e89441a..526df03 100644 (file)
--- a/Test/baseResults/doWhileLoop.frag.out
+++ b/Test/baseResults/doWhileLoop.frag.out
@@ -1,5 +1,4 @@
 doWhileLoop.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:7  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/earlyReturnDiscard.frag.out b/Test/baseResults/earlyReturnDiscard.frag.out
index f3b63cd..925e168 100644 (file)
--- a/Test/baseResults/earlyReturnDiscard.frag.out
+++ b/Test/baseResults/earlyReturnDiscard.frag.out
@@ -1,5 +1,4 @@
 earlyReturnDiscard.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:19  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/empty.frag.out b/Test/baseResults/empty.frag.out
index d431ff9..dadf076 100644 (file)
--- a/Test/baseResults/empty.frag.out
+++ b/Test/baseResults/empty.frag.out
@@ -1,17 +1,14 @@
 empty.frag\r
-\r
 Shader version: 100\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r
 empty2.frag\r
-\r
 Shader version: 100\r
 0:? Sequence\r
 0:?   Linker Objects\r
 \r
 empty3.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:?   Linker Objects\r

diff --git a/Test/baseResults/flowControl.frag.out b/Test/baseResults/flowControl.frag.out
index 91fa850..ddeb820 100644 (file)
--- a/Test/baseResults/flowControl.frag.out
+++ b/Test/baseResults/flowControl.frag.out
@@ -1,5 +1,4 @@
 flowControl.frag\r
-\r
 Shader version: 120\r
 0:? Sequence\r
 0:10  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/forLoop.frag.out b/Test/baseResults/forLoop.frag.out
index 52d96ae..ace2158 100644 (file)
--- a/Test/baseResults/forLoop.frag.out
+++ b/Test/baseResults/forLoop.frag.out
@@ -1,5 +1,4 @@
 forLoop.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:10  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/forwardRef.frag.out b/Test/baseResults/forwardRef.frag.out
index d435d25..a39ed20 100644 (file)
--- a/Test/baseResults/forwardRef.frag.out
+++ b/Test/baseResults/forwardRef.frag.out
@@ -1,5 +1,4 @@
 forwardRef.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:11  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/length.frag.out b/Test/baseResults/length.frag.out
index 5f2182b..8725a16 100644 (file)
--- a/Test/baseResults/length.frag.out
+++ b/Test/baseResults/length.frag.out
@@ -1,5 +1,4 @@
 length.frag\r
-\r
 Shader version: 120\r
 0:? Sequence\r
 0:11  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/link1.frag.out b/Test/baseResults/link1.frag.out
index aa31c5f..d585783 100644 (file)
--- a/Test/baseResults/link1.frag.out
+++ b/Test/baseResults/link1.frag.out
@@ -1,5 +1,4 @@
 link1.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:8  Sequence\r
@@ -80,7 +79,6 @@ Shader version: 130
 0:?       3.900000\r
 \r
 link2.frag\r
-\r
 Shader version: 130\r
 Requested GL_OES_standard_derivatives\r
 Requested GL_OES_texture_3D\r
@@ -152,7 +150,6 @@ Requested GL_OES_texture_3D
 0:?       3.900000\r
 \r
 link3.frag\r
-\r
 Shader version: 300\r
 Requested GL_OES_EGL_image_external\r
 Requested GL_OES_standard_derivatives\r

diff --git a/Test/baseResults/mains1.frag.out b/Test/baseResults/mains1.frag.out
index baf15df..596b845 100644 (file)
--- a/Test/baseResults/mains1.frag.out
+++ b/Test/baseResults/mains1.frag.out
@@ -1,5 +1,4 @@
 mains1.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:3  Function Definition: main( (global void)\r
@@ -7,7 +6,6 @@ Shader version: 110
 0:?   Linker Objects\r
 \r
 mains2.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:3  Function Definition: main( (global void)\r
@@ -30,7 +28,6 @@ ERROR: node is still EOpNull!
 0:?   Linker Objects\r
 \r
 noMain2.geom\r
-\r
 Shader version: 150\r
 invocations = 0\r
 max_vertices = 0\r

diff --git a/Test/baseResults/noMain.vert.out b/Test/baseResults/noMain.vert.out
index 7403e1a..052e27e 100644 (file)
--- a/Test/baseResults/noMain.vert.out
+++ b/Test/baseResults/noMain.vert.out
@@ -1,5 +1,4 @@
 noMain.vert\r
-\r
 Shader version: 300\r
 0:? Sequence\r
 0:3  Function Definition: foo( (global void)\r

diff --git a/Test/baseResults/nonSquare.vert.out b/Test/baseResults/nonSquare.vert.out
index a34d034..9f5c100 100644 (file)
--- a/Test/baseResults/nonSquare.vert.out
+++ b/Test/baseResults/nonSquare.vert.out
@@ -1,5 +1,4 @@
 nonSquare.vert\r
-\r
 Shader version: 120\r
 0:? Sequence\r
 0:15  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/pointCoord.frag.out b/Test/baseResults/pointCoord.frag.out
index cc5c586..157eaa6 100644 (file)
--- a/Test/baseResults/pointCoord.frag.out
+++ b/Test/baseResults/pointCoord.frag.out
@@ -1,5 +1,4 @@
 pointCoord.frag\r
-\r
 Shader version: 100\r
 0:? Sequence\r
 0:5  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/prepost.frag.out b/Test/baseResults/prepost.frag.out
index 581210c..42769ff 100644 (file)
--- a/Test/baseResults/prepost.frag.out
+++ b/Test/baseResults/prepost.frag.out
@@ -1,5 +1,4 @@
 prepost.frag\r
-\r
 Shader version: 140\r
 0:? Sequence\r
 0:3  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/preprocessor.edge_cases.vert.out b/Test/baseResults/preprocessor.edge_cases.vert.out
index d667ca7..9c51bc4 100644 (file)
--- 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);\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.errors.vert.out b/Test/baseResults/preprocessor.errors.vert.out
index 409c16a..e0cabb8 100644 (file)
--- a/Test/baseResults/preprocessor.errors.vert.out
+++ b/Test/baseResults/preprocessor.errors.vert.out
@@ -14,5 +14,3 @@
 int main(){\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.extensions.vert.out b/Test/baseResults/preprocessor.extensions.vert.out
index 49d1804..a0cfb05 100644 (file)
--- a/Test/baseResults/preprocessor.extensions.vert.out
+++ b/Test/baseResults/preprocessor.extensions.vert.out
@@ -10,5 +10,3 @@
 int main(){\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.function_macro.vert.out b/Test/baseResults/preprocessor.function_macro.vert.out
index 340d71b..9476784 100644 (file)
--- 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);\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.line.vert.out b/Test/baseResults/preprocessor.line.vert.out
index a7742fc..2893521 100644 (file)
--- a/Test/baseResults/preprocessor.line.vert.out
+++ b/Test/baseResults/preprocessor.line.vert.out
@@ -22,5 +22,3 @@ void main(){
 #line 1\r
 \r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.pragma.vert.out b/Test/baseResults/preprocessor.pragma.vert.out
index 22de1ce..62b6a13 100644 (file)
--- a/Test/baseResults/preprocessor.pragma.vert.out
+++ b/Test/baseResults/preprocessor.pragma.vert.out
@@ -10,5 +10,3 @@
 int main(){\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/preprocessor.simple.vert.out b/Test/baseResults/preprocessor.simple.vert.out
index 8364576..878fff7 100644 (file)
--- 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));\r
 }\r
 \r
-\r
-\r

diff --git a/Test/baseResults/recurse1.vert.out b/Test/baseResults/recurse1.vert.out
index 0f9a0b3..1b43ee1 100644 (file)
--- a/Test/baseResults/recurse1.vert.out
+++ b/Test/baseResults/recurse1.vert.out
@@ -1,5 +1,4 @@
 recurse1.vert\r
-\r
 Shader version: 330\r
 0:? Sequence\r
 0:3  Function Definition: main( (global void)\r
@@ -69,7 +68,6 @@ Shader version: 330
 0:?     'gl_InstanceID' (gl_InstanceId int InstanceId)\r
 \r
 recurse1.frag\r
-\r
 Shader version: 330\r
 0:? Sequence\r
 0:5  Function Definition: main( (global void)\r
@@ -157,7 +155,6 @@ Shader version: 330
 0:?   Linker Objects\r
 \r
 recurse2.frag\r
-\r
 Shader version: 330\r
 0:? Sequence\r
 0:9  Function Definition: cbar(i1; (global float)\r

diff --git a/Test/baseResults/reflection.vert.out b/Test/baseResults/reflection.vert.out
index 0a74c14..cb01abe 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 Uniform reflection:\r
 image_ui2D: offset -1, type 9063, size 1, index -1\r
 sampler_2D: offset -1, type 8b5e, size 1, index -1\r

diff --git a/Test/baseResults/sample.frag.out b/Test/baseResults/sample.frag.out
index 00ac78e..bfa6e5a 100644 (file)
--- a/Test/baseResults/sample.frag.out
+++ b/Test/baseResults/sample.frag.out
@@ -1,5 +1,4 @@
 sample.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:38  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/sample.vert.out b/Test/baseResults/sample.vert.out
index ff886f7..a2071e9 100644 (file)
--- a/Test/baseResults/sample.vert.out
+++ b/Test/baseResults/sample.vert.out
@@ -1,5 +1,4 @@
 sample.vert\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:38  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/spv.100ops.frag.out b/Test/baseResults/spv.100ops.frag.out
index c937419..151535b 100644 (file)
--- a/Test/baseResults/spv.100ops.frag.out
+++ b/Test/baseResults/spv.100ops.frag.out
@@ -1,11 +1,8 @@
 spv.100ops.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 48\r

diff --git a/Test/baseResults/spv.130.frag.out b/Test/baseResults/spv.130.frag.out
index 123a45b..99ca6f1 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: texture gather\r

diff --git a/Test/baseResults/spv.140.frag.out b/Test/baseResults/spv.140.frag.out
index 3c43631..afcd6e0 100644 (file)
--- a/Test/baseResults/spv.140.frag.out
+++ b/Test/baseResults/spv.140.frag.out
@@ -1,11 +1,8 @@
 spv.140.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 90\r

diff --git a/Test/baseResults/spv.150.geom.out b/Test/baseResults/spv.150.geom.out
index b951524..c3a9fe6 100644 (file)
--- a/Test/baseResults/spv.150.geom.out
+++ b/Test/baseResults/spv.150.geom.out
@@ -1,11 +1,8 @@
 spv.150.geom\r
 \r
-\r
-\r
 Linked geometry stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 72\r

diff --git a/Test/baseResults/spv.150.vert.out b/Test/baseResults/spv.150.vert.out
index a40a454..424ecc8 100644 (file)
--- a/Test/baseResults/spv.150.vert.out
+++ b/Test/baseResults/spv.150.vert.out
@@ -1,11 +1,8 @@
 spv.150.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 53\r

diff --git a/Test/baseResults/spv.300BuiltIns.vert.out b/Test/baseResults/spv.300BuiltIns.vert.out
index 13edf06..1e61e9a 100644 (file)
--- a/Test/baseResults/spv.300BuiltIns.vert.out
+++ b/Test/baseResults/spv.300BuiltIns.vert.out
@@ -1,11 +1,8 @@
 spv.300BuiltIns.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 41\r

diff --git a/Test/baseResults/spv.300layout.frag.out b/Test/baseResults/spv.300layout.frag.out
index 5e2f699..678ceec 100644 (file)
--- a/Test/baseResults/spv.300layout.frag.out
+++ b/Test/baseResults/spv.300layout.frag.out
@@ -1,11 +1,8 @@
 spv.300layout.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 38\r

diff --git a/Test/baseResults/spv.300layout.vert.out b/Test/baseResults/spv.300layout.vert.out
index 348ee70..f996449 100644 (file)
--- a/Test/baseResults/spv.300layout.vert.out
+++ b/Test/baseResults/spv.300layout.vert.out
@@ -1,9 +1,6 @@
 spv.300layout.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 Missing functionality: binary operation on matrix\r

diff --git a/Test/baseResults/spv.300layoutp.vert.out b/Test/baseResults/spv.300layoutp.vert.out
index c7d9882..5a813b8 100644 (file)
--- a/Test/baseResults/spv.300layoutp.vert.out
+++ b/Test/baseResults/spv.300layoutp.vert.out
@@ -1,11 +1,8 @@
 spv.300layoutp.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 112\r

diff --git a/Test/baseResults/spv.310.comp.out b/Test/baseResults/spv.310.comp.out
index b12580b..d1f8a9a 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked compute stage:\r
 \r
 \r
-\r
 Missing functionality: Unsized array\r

diff --git a/Test/baseResults/spv.330.geom.out b/Test/baseResults/spv.330.geom.out
index ae4e043..24c938e 100644 (file)
--- a/Test/baseResults/spv.330.geom.out
+++ b/Test/baseResults/spv.330.geom.out
@@ -1,11 +1,8 @@
 spv.330.geom\r
 \r
-\r
-\r
 Linked geometry stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 33\r

diff --git a/Test/baseResults/spv.400.frag.out b/Test/baseResults/spv.400.frag.out
index 9e98d2c..2024d53 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: texture gather\r

diff --git a/Test/baseResults/spv.400.tesc.out b/Test/baseResults/spv.400.tesc.out
index ac08a2b..56ece6d 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked tessellation control stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 89\r

diff --git a/Test/baseResults/spv.400.tese.out b/Test/baseResults/spv.400.tese.out
index d16eb8e..5bcd393 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked tessellation evaluation stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 99\r

diff --git a/Test/baseResults/spv.420.geom.out b/Test/baseResults/spv.420.geom.out
index ba12e9e..8a0ecf3 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked geometry stage:\r
 \r
 \r
-\r
 Missing functionality: texture gather\r

diff --git a/Test/baseResults/spv.430.vert.out b/Test/baseResults/spv.430.vert.out
index d67e8fa..5a556cf 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 62\r

diff --git a/Test/baseResults/spv.Operations.frag.out b/Test/baseResults/spv.Operations.frag.out
index 8cddbd7..38ddcd9 100644 (file)
--- a/Test/baseResults/spv.Operations.frag.out
+++ b/Test/baseResults/spv.Operations.frag.out
@@ -1,11 +1,8 @@
 spv.Operations.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 399\r

diff --git a/Test/baseResults/spv.accessChain.frag.out b/Test/baseResults/spv.accessChain.frag.out
index 1c72b8a..fc3a321 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 198\r

diff --git a/Test/baseResults/spv.aggOps.frag.out b/Test/baseResults/spv.aggOps.frag.out
index 51d4d60..b92d93c 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: Composite comparison of non-vectors\r

diff --git a/Test/baseResults/spv.always-discard.frag.out b/Test/baseResults/spv.always-discard.frag.out
index 01a2239..b57b543 100644 (file)
--- a/Test/baseResults/spv.always-discard.frag.out
+++ b/Test/baseResults/spv.always-discard.frag.out
@@ -1,11 +1,8 @@
 spv.always-discard.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 81\r

diff --git a/Test/baseResults/spv.always-discard2.frag.out b/Test/baseResults/spv.always-discard2.frag.out
index c4096b0..06cc543 100644 (file)
--- a/Test/baseResults/spv.always-discard2.frag.out
+++ b/Test/baseResults/spv.always-discard2.frag.out
@@ -1,11 +1,8 @@
 spv.always-discard2.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 37\r

diff --git a/Test/baseResults/spv.conditionalDiscard.frag.out b/Test/baseResults/spv.conditionalDiscard.frag.out
index f66685f..ea21a72 100644 (file)
--- a/Test/baseResults/spv.conditionalDiscard.frag.out
+++ b/Test/baseResults/spv.conditionalDiscard.frag.out
@@ -1,11 +1,8 @@
 spv.conditionalDiscard.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 36\r

diff --git a/Test/baseResults/spv.conversion.frag.out b/Test/baseResults/spv.conversion.frag.out
index dd1679a..f8ba2cd 100644 (file)
--- a/Test/baseResults/spv.conversion.frag.out
+++ b/Test/baseResults/spv.conversion.frag.out
@@ -1,11 +1,8 @@
 spv.conversion.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 444\r

diff --git a/Test/baseResults/spv.dataOut.frag.out b/Test/baseResults/spv.dataOut.frag.out
index f33acd7..fee2eef 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 21\r

diff --git a/Test/baseResults/spv.dataOutIndirect.frag.out b/Test/baseResults/spv.dataOutIndirect.frag.out
index 62b9d54..7a75b6d 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 23\r

diff --git a/Test/baseResults/spv.dataOutIndirect.vert.out b/Test/baseResults/spv.dataOutIndirect.vert.out
index 8c39498..36b43c4 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 39\r

diff --git a/Test/baseResults/spv.deepRvalue.frag.out b/Test/baseResults/spv.deepRvalue.frag.out
index 5d6d131..1ed6681 100644 (file)
--- a/Test/baseResults/spv.deepRvalue.frag.out
+++ b/Test/baseResults/spv.deepRvalue.frag.out
@@ -1,9 +1,6 @@
 spv.deepRvalue.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: binary operation on matrix\r

diff --git a/Test/baseResults/spv.depthOut.frag.out b/Test/baseResults/spv.depthOut.frag.out
index f8e09ce..211ab14 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 19\r

diff --git a/Test/baseResults/spv.discard-dce.frag.out b/Test/baseResults/spv.discard-dce.frag.out
index d90eb11..366b5bc 100644 (file)
--- a/Test/baseResults/spv.discard-dce.frag.out
+++ b/Test/baseResults/spv.discard-dce.frag.out
@@ -1,11 +1,8 @@
 spv.discard-dce.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 81\r

diff --git a/Test/baseResults/spv.do-simple.vert.out b/Test/baseResults/spv.do-simple.vert.out
index e376b82..321d0e0 100644 (file)
--- a/Test/baseResults/spv.do-simple.vert.out
+++ b/Test/baseResults/spv.do-simple.vert.out
@@ -1,11 +1,8 @@
 spv.do-simple.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 26\r

diff --git a/Test/baseResults/spv.do-while-continue-break.vert.out b/Test/baseResults/spv.do-while-continue-break.vert.out
index e9d4526..5fb34db 100644 (file)
--- 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\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 48\r

diff --git a/Test/baseResults/spv.doWhileLoop.frag.out b/Test/baseResults/spv.doWhileLoop.frag.out
index 62bf5b1..18783ba 100644 (file)
--- a/Test/baseResults/spv.doWhileLoop.frag.out
+++ b/Test/baseResults/spv.doWhileLoop.frag.out
@@ -1,11 +1,8 @@
 spv.doWhileLoop.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 34\r

diff --git a/Test/baseResults/spv.double.comp.out b/Test/baseResults/spv.double.comp.out
index d830533..6e11825 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked compute stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 63\r

diff --git a/Test/baseResults/spv.earlyReturnDiscard.frag.out b/Test/baseResults/spv.earlyReturnDiscard.frag.out
index 9669e10..bb61deb 100644 (file)
--- a/Test/baseResults/spv.earlyReturnDiscard.frag.out
+++ b/Test/baseResults/spv.earlyReturnDiscard.frag.out
@@ -1,11 +1,8 @@
 spv.earlyReturnDiscard.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 112\r

diff --git a/Test/baseResults/spv.flowControl.frag.out b/Test/baseResults/spv.flowControl.frag.out
index e8d0395..982f282 100644 (file)
--- a/Test/baseResults/spv.flowControl.frag.out
+++ b/Test/baseResults/spv.flowControl.frag.out
@@ -1,11 +1,8 @@
 spv.flowControl.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 42\r

diff --git a/Test/baseResults/spv.for-continue-break.vert.out b/Test/baseResults/spv.for-continue-break.vert.out
index 8df0a08..a1a0ae1 100644 (file)
--- 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\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 49\r

diff --git a/Test/baseResults/spv.for-simple.vert.out b/Test/baseResults/spv.for-simple.vert.out
index 180805a..1004945 100644 (file)
--- a/Test/baseResults/spv.for-simple.vert.out
+++ b/Test/baseResults/spv.for-simple.vert.out
@@ -1,11 +1,8 @@
 spv.for-simple.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 26\r

diff --git a/Test/baseResults/spv.forLoop.frag.out b/Test/baseResults/spv.forLoop.frag.out
index 85360ca..ccf05b1 100644 (file)
--- a/Test/baseResults/spv.forLoop.frag.out
+++ b/Test/baseResults/spv.forLoop.frag.out
@@ -1,11 +1,8 @@
 spv.forLoop.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 123\r

diff --git a/Test/baseResults/spv.forwardFun.frag.out b/Test/baseResults/spv.forwardFun.frag.out
index 2be58e1..a4781e3 100644 (file)
--- a/Test/baseResults/spv.forwardFun.frag.out
+++ b/Test/baseResults/spv.forwardFun.frag.out
@@ -1,11 +1,8 @@
 spv.forwardFun.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 59\r

diff --git a/Test/baseResults/spv.functionCall.frag.out b/Test/baseResults/spv.functionCall.frag.out
index a8bb6c2..1d7aa74 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 76\r

diff --git a/Test/baseResults/spv.functionSemantics.frag.out b/Test/baseResults/spv.functionSemantics.frag.out
index c86bb8e..3eafe32 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 159\r

diff --git a/Test/baseResults/spv.length.frag.out b/Test/baseResults/spv.length.frag.out
index 2f4db55..8de3e4b 100644 (file)
--- a/Test/baseResults/spv.length.frag.out
+++ b/Test/baseResults/spv.length.frag.out
@@ -1,11 +1,8 @@
 spv.length.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 34\r

diff --git a/Test/baseResults/spv.localAggregates.frag.out b/Test/baseResults/spv.localAggregates.frag.out
index 184b24c..97f358b 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 134\r

diff --git a/Test/baseResults/spv.loops.frag.out b/Test/baseResults/spv.loops.frag.out
index a0cfef7..750e11d 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 737\r

diff --git a/Test/baseResults/spv.loopsArtificial.frag.out b/Test/baseResults/spv.loopsArtificial.frag.out
index 7aef1ae..768571c 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 192\r

diff --git a/Test/baseResults/spv.matFun.vert.out b/Test/baseResults/spv.matFun.vert.out
index 2a0a0fc..cebf02a 100644 (file)
--- a/Test/baseResults/spv.matFun.vert.out
+++ b/Test/baseResults/spv.matFun.vert.out
@@ -1,11 +1,8 @@
 spv.matFun.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 94\r

diff --git a/Test/baseResults/spv.matrix.frag.out b/Test/baseResults/spv.matrix.frag.out
index cec418d..ef7f0b0 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: Composite comparison of non-vectors\r

diff --git a/Test/baseResults/spv.matrix2.frag.out b/Test/baseResults/spv.matrix2.frag.out
index c40b01c..8e961fa 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: binary operation on matrix\r

diff --git a/Test/baseResults/spv.newTexture.frag.out b/Test/baseResults/spv.newTexture.frag.out
index 1962e1a..a4e375d 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: texel fetch\r

diff --git a/Test/baseResults/spv.nonSquare.vert.out b/Test/baseResults/spv.nonSquare.vert.out
index 969e63a..94fe8cb 100644 (file)
--- a/Test/baseResults/spv.nonSquare.vert.out
+++ b/Test/baseResults/spv.nonSquare.vert.out
@@ -1,11 +1,8 @@
 spv.nonSquare.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 91\r

diff --git a/Test/baseResults/spv.precision.frag.out b/Test/baseResults/spv.precision.frag.out
index 5ba1a5f..fdbe7e4 100644 (file)
--- a/Test/baseResults/spv.precision.frag.out
+++ b/Test/baseResults/spv.precision.frag.out
@@ -1,11 +1,8 @@
 spv.precision.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 111\r

diff --git a/Test/baseResults/spv.prepost.frag.out b/Test/baseResults/spv.prepost.frag.out
index a9031e3..e9ac5ca 100644 (file)
--- a/Test/baseResults/spv.prepost.frag.out
+++ b/Test/baseResults/spv.prepost.frag.out
@@ -1,11 +1,8 @@
 spv.prepost.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 97\r

diff --git a/Test/baseResults/spv.qualifiers.vert.out b/Test/baseResults/spv.qualifiers.vert.out
index 1df120f..df8063a 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 26\r

diff --git a/Test/baseResults/spv.set.vert.out b/Test/baseResults/spv.set.vert.out
index 7a18683..b968d67 100644 (file)
--- 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.\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 25\r

diff --git a/Test/baseResults/spv.simpleFunctionCall.frag.out b/Test/baseResults/spv.simpleFunctionCall.frag.out
index 82a2502..35c6dfb 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 23\r

diff --git a/Test/baseResults/spv.simpleMat.vert.out b/Test/baseResults/spv.simpleMat.vert.out
index 3dcf879..8b16d76 100644 (file)
--- a/Test/baseResults/spv.simpleMat.vert.out
+++ b/Test/baseResults/spv.simpleMat.vert.out
@@ -1,11 +1,8 @@
 spv.simpleMat.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 44\r

diff --git a/Test/baseResults/spv.structAssignment.frag.out b/Test/baseResults/spv.structAssignment.frag.out
index d8a6a4e..d41f57b 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 50\r

diff --git a/Test/baseResults/spv.structDeref.frag.out b/Test/baseResults/spv.structDeref.frag.out
index 4e58adc..840f08c 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 120\r

diff --git a/Test/baseResults/spv.structure.frag.out b/Test/baseResults/spv.structure.frag.out
index 727187d..3c1053e 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 61\r

diff --git a/Test/baseResults/spv.switch.frag.out b/Test/baseResults/spv.switch.frag.out
index cc527af..9ae9790 100644 (file)
--- 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 \r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 261\r

diff --git a/Test/baseResults/spv.swizzle.frag.out b/Test/baseResults/spv.swizzle.frag.out
index c9a6a2c..e39c88c 100644 (file)
--- a/Test/baseResults/spv.swizzle.frag.out
+++ b/Test/baseResults/spv.swizzle.frag.out
@@ -1,11 +1,8 @@
 spv.swizzle.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 112\r

diff --git a/Test/baseResults/spv.test.frag.out b/Test/baseResults/spv.test.frag.out
index 8ebb946..6176f3c 100644 (file)
--- a/Test/baseResults/spv.test.frag.out
+++ b/Test/baseResults/spv.test.frag.out
@@ -1,11 +1,8 @@
 spv.test.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 54\r

diff --git a/Test/baseResults/spv.test.vert.out b/Test/baseResults/spv.test.vert.out
index efd30d7..465b63f 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 Missing functionality: ftransform()\r

diff --git a/Test/baseResults/spv.texture.frag.out b/Test/baseResults/spv.texture.frag.out
index f3f6da3..ab5146f 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 Missing functionality: texel fetch\r

diff --git a/Test/baseResults/spv.texture.vert.out b/Test/baseResults/spv.texture.vert.out
index ed87334..cf62bc1 100644 (file)
--- a/Test/baseResults/spv.texture.vert.out
+++ b/Test/baseResults/spv.texture.vert.out
@@ -1,11 +1,8 @@
 spv.texture.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 132\r

diff --git a/Test/baseResults/spv.types.frag.out b/Test/baseResults/spv.types.frag.out
index b33a37b..f2718e7 100644 (file)
--- a/Test/baseResults/spv.types.frag.out
+++ b/Test/baseResults/spv.types.frag.out
@@ -1,11 +1,8 @@
 spv.types.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 264\r

diff --git a/Test/baseResults/spv.uint.frag.out b/Test/baseResults/spv.uint.frag.out
index eb7f4ad..e7294a0 100644 (file)
--- a/Test/baseResults/spv.uint.frag.out
+++ b/Test/baseResults/spv.uint.frag.out
@@ -1,11 +1,8 @@
 spv.uint.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 206\r

diff --git a/Test/baseResults/spv.uniformArray.frag.out b/Test/baseResults/spv.uniformArray.frag.out
index 62d88f8..dc3ae72 100644 (file)
--- a/Test/baseResults/spv.uniformArray.frag.out
+++ b/Test/baseResults/spv.uniformArray.frag.out
@@ -1,11 +1,8 @@
 spv.uniformArray.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 52\r

diff --git a/Test/baseResults/spv.variableArrayIndex.frag.out b/Test/baseResults/spv.variableArrayIndex.frag.out
index ab7ac62..7dc740a 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 93\r

diff --git a/Test/baseResults/spv.varyingArray.frag.out b/Test/baseResults/spv.varyingArray.frag.out
index f904a47..0f20e66 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 61\r

diff --git a/Test/baseResults/spv.varyingArrayIndirect.frag.out b/Test/baseResults/spv.varyingArrayIndirect.frag.out
index c147e86..54c3763 100644 (file)
--- 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\r
 \r
 \r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 69\r

diff --git a/Test/baseResults/spv.voidFunction.frag.out b/Test/baseResults/spv.voidFunction.frag.out
index 430ba7e..cad7fe7 100644 (file)
--- a/Test/baseResults/spv.voidFunction.frag.out
+++ b/Test/baseResults/spv.voidFunction.frag.out
@@ -1,11 +1,8 @@
 spv.voidFunction.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 43\r

diff --git a/Test/baseResults/spv.while-continue-break.vert.out b/Test/baseResults/spv.while-continue-break.vert.out
index 9d4d3bb..21c5296 100644 (file)
--- 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\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 43\r

diff --git a/Test/baseResults/spv.while-simple.vert.out b/Test/baseResults/spv.while-simple.vert.out
index 8f35aa1..93bb145 100644 (file)
--- a/Test/baseResults/spv.while-simple.vert.out
+++ b/Test/baseResults/spv.while-simple.vert.out
@@ -1,11 +1,8 @@
 spv.while-simple.vert\r
 \r
-\r
-\r
 Linked vertex stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 24\r

diff --git a/Test/baseResults/spv.whileLoop.frag.out b/Test/baseResults/spv.whileLoop.frag.out
index d448c15..6eb3fdc 100644 (file)
--- a/Test/baseResults/spv.whileLoop.frag.out
+++ b/Test/baseResults/spv.whileLoop.frag.out
@@ -1,11 +1,8 @@
 spv.whileLoop.frag\r
 \r
-\r
-\r
 Linked fragment stage:\r
 \r
 \r
-\r
 // Module Version 99\r
 // Generated by (magic number): 51a00bb\r
 // Id's are bound by 32\r

diff --git a/Test/baseResults/swizzle.frag.out b/Test/baseResults/swizzle.frag.out
index d706c6c..eddb2fb 100644 (file)
--- a/Test/baseResults/swizzle.frag.out
+++ b/Test/baseResults/swizzle.frag.out
@@ -1,5 +1,4 @@
 swizzle.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:9  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/test.frag.out b/Test/baseResults/test.frag.out
index 4fd96c2..da62bea 100644 (file)
--- a/Test/baseResults/test.frag.out
+++ b/Test/baseResults/test.frag.out
@@ -1,5 +1,4 @@
 test.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:13  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/types.frag.out b/Test/baseResults/types.frag.out
index fb52b1a..e55c591 100644 (file)
--- a/Test/baseResults/types.frag.out
+++ b/Test/baseResults/types.frag.out
@@ -1,5 +1,4 @@
 types.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:33  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/uniformArray.frag.out b/Test/baseResults/uniformArray.frag.out
index 6c70af8..f2f0901 100644 (file)
--- a/Test/baseResults/uniformArray.frag.out
+++ b/Test/baseResults/uniformArray.frag.out
@@ -1,5 +1,4 @@
 uniformArray.frag\r
-\r
 Shader version: 130\r
 0:? Sequence\r
 0:7  Function Definition: main( (global void)\r

diff --git a/Test/baseResults/voidFunction.frag.out b/Test/baseResults/voidFunction.frag.out
index 342119d..3124ab2 100644 (file)
--- a/Test/baseResults/voidFunction.frag.out
+++ b/Test/baseResults/voidFunction.frag.out
@@ -1,5 +1,4 @@
 voidFunction.frag\r
-\r
 Shader version: 120\r
 0:? Sequence\r
 0:7  Sequence\r

diff --git a/Test/baseResults/whileLoop.frag.out b/Test/baseResults/whileLoop.frag.out
index 5147bff..87d3af7 100644 (file)
--- a/Test/baseResults/whileLoop.frag.out
+++ b/Test/baseResults/whileLoop.frag.out
@@ -1,5 +1,4 @@
 whileLoop.frag\r
-\r
 Shader version: 110\r
 0:? Sequence\r
 0:7  Function Definition: main( (global void)\r