From cee88e364483e17a3f64b47f2e1c37d6fd93da3c Mon Sep 17 00:00:00 2001 From: John Kessenich <cepheus@frii.com> Date: Sun, 16 Aug 2015 11:35:30 -0600 Subject: [PATCH] Whitespace in preprocessor results; trying to eliminate differences. --- .../preprocessor.cpp_style___FILE__.vert.out | 74 +++++++++---------- ...rocessor.cpp_style_line_directive.vert.err | 30 ++++---- .../preprocessor.include.disabled.vert.err | 10 +-- .../preprocessor.include.enabled.vert.err | 10 +-- glslang/Include/revision.h | 4 +- 5 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Test/baseResults/preprocessor.cpp_style___FILE__.vert.out b/Test/baseResults/preprocessor.cpp_style___FILE__.vert.out index e63d81a61..7deb27906 100644 --- a/Test/baseResults/preprocessor.cpp_style___FILE__.vert.out +++ b/Test/baseResults/preprocessor.cpp_style___FILE__.vert.out @@ -1,37 +1,37 @@ -#extension GL_GOOGLE_cpp_style_line_directive : enable - -0 - -#line 150 "a.h" - "a.h" - -#line 24 - "a.h" - -#line 42 - "a.h" - -#line 30 "b.cc" - "b.cc" - -#line 10 3 - 3 - -#line 48 - 3 - -#line 4 - 3 - -#line 55 100 - 100 - -#line 1000 "c" - "c" - -#line 42 1 - 1 - -#line 42 "this-is-a-quite-long-name-maybe-i-should-shorten-it" - "this-is-a-quite-long-name-maybe-i-should-shorten-it" - +#extension GL_GOOGLE_cpp_style_line_directive : enable + +0 + +#line 150 "a.h" + "a.h" + +#line 24 + "a.h" + +#line 42 + "a.h" + +#line 30 "b.cc" + "b.cc" + +#line 10 3 + 3 + +#line 48 + 3 + +#line 4 + 3 + +#line 55 100 + 100 + +#line 1000 "c" + "c" + +#line 42 1 + 1 + +#line 42 "this-is-a-quite-long-name-maybe-i-should-shorten-it" + "this-is-a-quite-long-name-maybe-i-should-shorten-it" + diff --git a/Test/baseResults/preprocessor.cpp_style_line_directive.vert.err b/Test/baseResults/preprocessor.cpp_style_line_directive.vert.err index dbfc50660..df89cd73f 100644 --- a/Test/baseResults/preprocessor.cpp_style_line_directive.vert.err +++ b/Test/baseResults/preprocessor.cpp_style_line_directive.vert.err @@ -1,15 +1,15 @@ -ERROR: 0:3: '#error' : at 0:3 -ERROR: a.h:150: '#error' : at a.h:150 -ERROR: a.h:24: '#error' : at a.h:24 -ERROR: a.h:42: '#error' : at a.h:42 -ERROR: b.cc:30: '#error' : at b.cc:30 -ERROR: 3:10: '#error' : at 3:10 -ERROR: 3:48: '#error' : at 3:48 -ERROR: 3:4: '#error' : at 3:4 -ERROR: 100:55: '#error' : at 100:55 -ERROR: c:1000: '#error' : at c:1000 -ERROR: 1:42: '#error' : at 1:42 -ERROR: this-is-a-quite-long-name-maybe-i-should-shorten-it:42: '#error' : at this-is-a-quite-long-name-maybe-i-should-shorten-it:42 -ERROR: 12 compilation errors. No code generated. - - +ERROR: 0:3: '#error' : at 0:3 +ERROR: a.h:150: '#error' : at a.h:150 +ERROR: a.h:24: '#error' : at a.h:24 +ERROR: a.h:42: '#error' : at a.h:42 +ERROR: b.cc:30: '#error' : at b.cc:30 +ERROR: 3:10: '#error' : at 3:10 +ERROR: 3:48: '#error' : at 3:48 +ERROR: 3:4: '#error' : at 3:4 +ERROR: 100:55: '#error' : at 100:55 +ERROR: c:1000: '#error' : at c:1000 +ERROR: 1:42: '#error' : at 1:42 +ERROR: this-is-a-quite-long-name-maybe-i-should-shorten-it:42: '#error' : at this-is-a-quite-long-name-maybe-i-should-shorten-it:42 +ERROR: 12 compilation errors. No code generated. + + diff --git a/Test/baseResults/preprocessor.include.disabled.vert.err b/Test/baseResults/preprocessor.include.disabled.vert.err index 1145a3147..2fd90c9c3 100644 --- a/Test/baseResults/preprocessor.include.disabled.vert.err +++ b/Test/baseResults/preprocessor.include.disabled.vert.err @@ -1,13 +1,13 @@ ERROR: 0:8000: '#include' : required extension not requested: GL_GOOGLE_include_directive -ERROR: 0:8000: '#include' : must be followed by a file designation +ERROR: 0:8000: '#include' : must be followed by a file designation ERROR: 0:8001: '#include' : required extension not requested: GL_GOOGLE_include_directive -ERROR: 0:8001: '#include' : must be followed by a file designation +ERROR: 0:8001: '#include' : must be followed by a file designation ERROR: 0:8002: '#include' : required extension not requested: GL_GOOGLE_include_directive -ERROR: 0:8002: '#include' : unexpected include directive +ERROR: 0:8002: '#include' : unexpected include directive ERROR: 0:8003: '#include' : required extension not requested: GL_GOOGLE_include_directive -ERROR: 0:8003: '#include' : extra content after file designation +ERROR: 0:8003: '#include' : extra content after file designation ERROR: 0:8004: '#include' : required extension not requested: GL_GOOGLE_include_directive -ERROR: 0:8004: '#include' : unexpected include directive +ERROR: 0:8004: '#include' : unexpected include directive ERROR: 10 compilation errors. No code generated. diff --git a/Test/baseResults/preprocessor.include.enabled.vert.err b/Test/baseResults/preprocessor.include.enabled.vert.err index 2cdf3f283..0f20e2726 100644 --- a/Test/baseResults/preprocessor.include.enabled.vert.err +++ b/Test/baseResults/preprocessor.include.enabled.vert.err @@ -1,8 +1,8 @@ -ERROR: 0:8000: '#include' : must be followed by a file designation -ERROR: 0:8001: '#include' : must be followed by a file designation -ERROR: 0:8002: '#include' : unexpected include directive -ERROR: 0:8003: '#include' : extra content after file designation -ERROR: 0:8004: '#include' : unexpected include directive +ERROR: 0:8000: '#include' : must be followed by a file designation +ERROR: 0:8001: '#include' : must be followed by a file designation +ERROR: 0:8002: '#include' : unexpected include directive +ERROR: 0:8003: '#include' : extra content after file designation +ERROR: 0:8004: '#include' : unexpected include directive ERROR: 5 compilation errors. No code generated. diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index e7d7f4d52..afc749df5 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "2.3.706" -#define GLSLANG_DATE "10-Aug-2015" +#define GLSLANG_REVISION "2.3.713" +#define GLSLANG_DATE "16-Aug-2015" -- GitLab