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

Fix line-continuation bug.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24021 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-11-12 22:01:32 +00:00
parent df0488dd0f
commit 029d746bad
6 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,16 @@ ERROR: node is still EOpNull!
0:20 'gl_Position' (gl_Position highp 4-component vector of float)
0:20 Construct vec4 (highp 4-component vector of float)
0:20 'foo' (highp float)
0:22 Function Definition: foo2(vf4; (highp 4-component vector of float)
0:22 Function Parameters:
0:22 'a' (in highp 4-component vector of float)
0:24 Sequence
0:24 Sequence
0:24 move second child to first child (highp 4-component vector of float)
0:24 'b' (highp 4-component vector of float)
0:24 'a' (in highp 4-component vector of float)
0:25 Branch: Return with expression
0:25 'b' (highp 4-component vector of float)
0:? Linker Objects
0:? 'foo' (highp float)
0:? 'gl_VertexID' (gl_VertexId highp int)

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

@@ -6,7 +6,8 @@ ERROR: 0:13: 'line continuation' : not supported for this version or the enabled
ERROR: 0:14: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:15: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:18: '#error' : e3
ERROR: 8 compilation errors. No code generated.
ERROR: 0:24: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 9 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:20 Function Definition: main( (void)
@@ -16,6 +17,16 @@ ERROR: node is still EOpNull!
0:20 'gl_Position' (gl_Position highp 4-component vector of float)
0:20 Construct vec4 (highp 4-component vector of float)
0:20 'foo' (highp float)
0:22 Function Definition: foo2(vf4; (highp 4-component vector of float)
0:22 Function Parameters:
0:22 'a' (in highp 4-component vector of float)
0:24 Sequence
0:24 Sequence
0:24 move second child to first child (highp 4-component vector of float)
0:24 'b' (highp 4-component vector of float)
0:24 'a' (in highp 4-component vector of float)
0:25 Branch: Return with expression
0:25 'b' (highp 4-component vector of float)
0:? Linker Objects
0:? 'foo' (highp float)

8
Test/lineContinuation.vert
View File

@@ -11,10 +11,16 @@ oo; // same as 'float foo;'
#error e2
#define MAIN void main() \
{ \
{ \
gl_Position = vec4(foo); \
}
#error e3
MAIN
vec4 foo2(vec4 a)
{
vec4 b = a; \
return b;
}

8
Test/lineContinuation100.vert
View File

@@ -11,10 +11,16 @@ oo; // same as 'float foo;'
#error e2
#define MAIN void main() \
{ \
{ \
gl_Position = vec4(foo); \
}
#error e3
MAIN
vec4 foo2(vec4 a)
{
vec4 b = a; \
return b;
}