mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made '\' at end of C++ comments be a warning. It is line continuation for some versions, but not others.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24396 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-12-06 21:45:15 +00:00
parent 828dc87a7c
commit 64bcb105c9
10 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/comment.frag.out
View File

@@ -1,5 +1,7 @@
comment.frag
Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
WARNING: 0:10: 'line continuation' : used at end of comment; the following line is still part of the comment
WARNING: 0:12: 'line continuation' : used at end of comment; the following line is still part of the comment
0:? Sequence
0:17 Function Definition: main( (void)

2
Test/baseResults/lineContinuation.vert.out
View File

@@ -1,4 +1,5 @@
lineContinuation.vert
WARNING: 0:3: 'line continuation' : used at end of comment; the following line is still part of the comment
ERROR: 0:6: '#error' : e1
ERROR: 0:11: '#error' : e2
ERROR: 0:18: '#error' : e3
@@ -25,6 +26,7 @@ ERROR: node is still EOpNull!
0:25 'b' (highp 4-component vector of float)
0:? Linker Objects
0:? 'foo' (highp float)
0:? 'goodDecl' (highp int)
0:? 'gl_VertexID' (gl_VertexId highp int)
0:? 'gl_InstanceID' (gl_InstanceId highp int)

6
Test/baseResults/lineContinuation100.vert.out
View File

@@ -1,6 +1,6 @@
lineContinuation100.vert
ERROR: 0:3: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:6: '#error' : e1
WARNING: 0:3: 'line continuation' : used at end of comment, but this version does not provide line continuation
ERROR: 0:4: '#error' : good error
ERROR: 0:8: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:11: '#error' : e2
ERROR: 0:13: 'line continuation' : not supported for this version or the enabled extensions
@@ -8,7 +8,7 @@ ERROR: 0:14: 'line continuation' : not supported for this version or the enabled
ERROR: 0:15: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:18: '#error' : e3
ERROR: 0:24: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 9 compilation errors. No code generated.
ERROR: 8 compilation errors. No code generated.
ERROR: node is still EOpNull!

6
Test/lineContinuation.vert
View File

@@ -28,3 +28,9 @@ vec4 foo2(vec4 a)
// aoeuntheo unatehutna \ antaehnathe
// anteonuth $ natohe " '
// anteonuth natohe
#define FOO int /* \
*/ goodDecl;
FOO

6
Test/lineContinuation100.vert
View File

@@ -1,9 +1,9 @@
#version 100
// this file cont\
ains no errors other than the #error which are there to see if line numbering for errors is correct
// non-line continuation comment \
#error good error
#error e1
float f\
oo; // same as 'float foo;'