diff options
| author | John Kessenich <cepheus@frii.com> | 2013-12-02 15:56:38 +0000 |
|---|---|---|
| committer | John Kessenich <cepheus@frii.com> | 2013-12-02 15:56:38 +0000 |
| commit | 98434bed003f1496cb213e941630c538dfe09e1c (patch) | |
| tree | 23812a561f10c1a4e64583b0beb32dcce75a69db /Test/baseResults/cppSimple.vert.out | |
| parent | 3591813a8b7c32a2682a106a243cc58c223f9204 (diff) | |
| download | glslang-98434bed003f1496cb213e941630c538dfe09e1c.tar.gz | |
Preprocessor fixes:
- Correctly handle non-directive lines starting with "#"
- Correctly ignore unrecognized #pragma
- Partial fix for new lines in the middle of macro invocation
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24266 e7fa87d3-cd2b-0410-9028-fcbf551c1848
Diffstat (limited to 'Test/baseResults/cppSimple.vert.out')
| -rw-r--r-- | Test/baseResults/cppSimple.vert.out | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/Test/baseResults/cppSimple.vert.out b/Test/baseResults/cppSimple.vert.out index 8d8ff798..d47c52bd 100644 --- a/Test/baseResults/cppSimple.vert.out +++ b/Test/baseResults/cppSimple.vert.out @@ -6,15 +6,15 @@ ERROR: 0:85: '#error' : good3 ERROR: 0:89: '#error' : good4
ERROR: 0:93: '#error' : good5
ERROR: 0:97: '#error' : good6
-ERROR: 0:101: 'preprocessor' : expected ')'
+ERROR: 0:101: 'preprocessor evaluation' : expected ')'
ERROR: 0:101: '#error' : bad1
ERROR: 0:104: '#if' : unexpected tokens following directive
ERROR: 0:105: '#error' : bad2
-ERROR: 0:109: 'preprocessor' : expected ')'
+ERROR: 0:109: 'preprocessor evaluation' : expected ')'
ERROR: 0:109: '#error' : bad3
ERROR: 0:112: '#if' : unexpected tokens following directive
ERROR: 0:113: '#error' : bad4
-ERROR: 0:117: 'preprocessor' : expected ')'
+ERROR: 0:117: 'preprocessor evaluation' : expected ')'
ERROR: 0:117: '#error' : bad5
ERROR: 0:120: '#if' : unexpected tokens following directive
ERROR: 0:121: '#error' : bad6
@@ -44,8 +44,25 @@ ERROR: 0:192: '#define' : Macro redefined; different substitutions: m8 ERROR: 0:196: '#define' : Macro redefined; different argument names: m9
ERROR: 0:204: '#undef' : can't use with built-in names (containing consecutive underscores)
ERROR: 0:205: '#undef' : can't use with built-in names ("GL_" prefix)
-ERROR: 0:209: '' : missing #endif
-ERROR: 45 compilation errors. No code generated.
+ERROR: 0:210: '#' : invalid directive
+ERROR: 0:211: '#' : invalid directive
+ERROR: 0:212: '#' : invalid directive
+ERROR: 0:213: '#' : invalid directive
+ERROR: 0:214: '#' : invalid directive
+ERROR: 0:215: '#' : invalid directive
+ERROR: 0:224: '#pragma' : optimize pragma syntax is incorrect
+ERROR: 0:225: '#pragma' : optimize pragma syntax is incorrect
+ERROR: 0:226: '#pragma' : debug pragma syntax is incorrect
+ERROR: 0:227: '#pragma' : debug pragma syntax is incorrect
+ERROR: 0:229: '#pragma' : optimize pragma syntax is incorrect
+ERROR: 0:230: '#pragma' : debug pragma syntax is incorrect
+ERROR: 0:233: 'line continuation' : not supported for this version or the enabled extensions
+ERROR: 0:235: 'line continuation' : not supported for this version or the enabled extensions
+ERROR: 0:236: '#error' : good continuation
+ERROR: 0:238: '#' : invalid directive: flizbit
+ERROR: 0:242: '#' : invalid directive: directive
+ERROR: 0:246: '' : missing #endif
+ERROR: 62 compilation errors. No code generated.
ERROR: node is still EOpNull!
|