diff options
| author | John Kessenich <cepheus@frii.com> | 2014-02-18 21:55:42 +0000 |
|---|---|---|
| committer | John Kessenich <cepheus@frii.com> | 2014-02-18 21:55:42 +0000 |
| commit | 52c351442ced0424b32da014d84d7ee1e9b2a490 (patch) | |
| tree | 43e6d58ab1fb6affdfc2800ef73b8ec6a63f57a2 /Test/baseResults/cppSimple.vert.out | |
| parent | 3bef952d48a0463249087224f2603735bf86219a (diff) | |
| download | glslang-52c351442ced0424b32da014d84d7ee1e9b2a490.tar.gz | |
Update rules for "GL_", "gl_", and "__" to match latest specification bug fixes.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@25392 e7fa87d3-cd2b-0410-9028-fcbf551c1848
Diffstat (limited to 'Test/baseResults/cppSimple.vert.out')
| -rw-r--r-- | Test/baseResults/cppSimple.vert.out | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Test/baseResults/cppSimple.vert.out b/Test/baseResults/cppSimple.vert.out index 66f6ddce..640f2514 100644 --- a/Test/baseResults/cppSimple.vert.out +++ b/Test/baseResults/cppSimple.vert.out @@ -25,11 +25,11 @@ ERROR: 0:136: 'length' : no matching overloaded function found ERROR: 0:136: '=' : cannot convert from 'const float' to 'int'
ERROR: 0:138: ''' : character literals not supported
ERROR: 0:138: ''' : character literals not supported
-ERROR: 0:141: '#define' : can't use with built-in names ("GL_" prefix)
-ERROR: 0:142: '#define' : can't use with built-in names ("GL_" prefix)
-ERROR: 0:143: '#define' : can't use with built-in names (containing consecutive underscores)
-ERROR: 0:144: '#define' : can't use with built-in names (containing consecutive underscores)
-ERROR: 0:145: '#define' : can't use with built-in names (containing consecutive underscores)
+ERROR: 0:141: '#define' : names beginning with "GL_" can't be defined: GL_
+ERROR: 0:142: '#define' : names beginning with "GL_" can't be defined: GL_Macro
+WARNING: 0:143: '#define' : names containing consecutive underscores are reserved: __M
+WARNING: 0:144: '#define' : names containing consecutive underscores are reserved: M__
+WARNING: 0:145: '#define' : names containing consecutive underscores are reserved: ABC__DE
ERROR: 0:148: '#else' : unexpected tokens following directive
ERROR: 0:149: '#elif' : #elif after #else
ERROR: 0:155: '#else' : unexpected tokens following directive
@@ -42,8 +42,8 @@ ERROR: 0:182: '#define' : Macro redefined; different number of arguments: m6 ERROR: 0:185: '#define' : Macro redefined; different substitutions: m7
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)
+WARNING: 0:204: '#undef' : names containing consecutive underscores are reserved: __VERSION__
+ERROR: 0:205: '#undef' : names beginning with "GL_" can't be defined: GL_ARB_texture_rectangle
ERROR: 0:210: '#' : invalid directive
ERROR: 0:211: '#' : invalid directive
ERROR: 0:212: '#' : invalid directive
@@ -83,7 +83,7 @@ ERROR: 12:9016: 'macro expansion' : expected '(' following FOOOM ERROR: 12:9017: 'preprocessor evaluation' : can't evaluate expression
ERROR: 12:9017: 'preprocessor evaluation' : bad expression
ERROR: 12:10003: '' : missing #endif
-ERROR: 83 compilation errors. No code generated.
+ERROR: 79 compilation errors. No code generated.
ERROR: node is still EOpNull!
|