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

Flesh out 4.x block redeclaration semantics:

Browse Source 
- hide non-redeclared anonymous members
 - array size limit checking
 - illegal member qualifiers
 - additional members


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24406 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-12-09 00:37:46 +00:00
parent e1b2e39a56
commit c719481d43
16 changed files with 229 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Test/baseResults/400.geom.out
View File

@@ -1,12 +1,14 @@
400.geom
Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
ERROR: 0:13: 'invocations' : can only apply to a standalone qualifier
ERROR: 0:24: 'length' : array must be declared with a size before using this method
ERROR: 0:35: 'length' : array must be declared with a size before using this method
ERROR: 0:39: 'triangles' : inconsistent input primitive for array size colorBad
ERROR: 0:43: 'triangles' : inconsistent input primitive for array size colorbad2
ERROR: 0:55: 'location' : repeated use of location 4
ERROR: 6 compilation errors. No code generated.
ERROR: 0:20: 'gl_PointSize' : cannot add layout to redeclared block member
ERROR: 0:20: 'gl_PointSize' : cannot add patch to redeclared block member
ERROR: 0:25: 'length' : array must be declared with a size before using this method
ERROR: 0:36: 'length' : array must be declared with a size before using this method
ERROR: 0:40: 'triangles' : inconsistent input primitive for array size colorBad
ERROR: 0:44: 'triangles' : inconsistent input primitive for array size colorbad2
ERROR: 0:56: 'location' : repeated use of location 4
ERROR: 8 compilation errors. No code generated.
invocations = 4
@@ -29,39 +31,39 @@ ERROR: node is still EOpNull!
0:10 move second child to first child (int)
0:10 'id' (int)
0:10 'gl_InvocationID' (in int)
0:22 Function Definition: foo( (void)
0:22 Function Parameters:
0:24 Sequence
0:24 Constant:
0:24 1 (const int)
0:25 gl_Position: direct index for structure (4-component vector of float)
0:25 direct index (block{gl_Position})
0:25 'gl_in' (in 3-element array of block{gl_Position})
0:25 Constant:
0:25 1 (const int)
0:25 Constant:
0:25 0 (const int)
0:33 Function Definition: foo2( (void)
0:33 Function Parameters:
0:35 Sequence
0:35 Constant:
0:35 1 (const int)
0:23 Function Definition: foo( (void)
0:23 Function Parameters:
0:25 Sequence
0:25 Constant:
0:25 1 (const int)
0:26 gl_Position: direct index for structure (4-component vector of float)
0:26 direct index (block{gl_Position,gl_PointSize})
0:26 'gl_in' (in 3-element array of block{gl_Position,gl_PointSize})
0:26 Constant:
0:26 1 (const int)
0:26 Constant:
0:26 0 (const int)
0:34 Function Definition: foo2( (void)
0:34 Function Parameters:
0:36 Sequence
0:36 Constant:
0:36 3 (const int)
0:45 Function Definition: foo3( (void)
0:45 Function Parameters:
0:47 Sequence
0:47 Constant:
0:47 3 (const int)
0:36 1 (const int)
0:37 Constant:
0:37 3 (const int)
0:46 Function Definition: foo3( (void)
0:46 Function Parameters:
0:48 Sequence
0:48 Constant:
0:48 3 (const int)
0:49 Constant:
0:49 3 (const int)
0:50 Constant:
0:50 3 (const int)
0:51 Constant:
0:51 3 (const int)
0:? Linker Objects
0:? '__anon__0' (layout(stream=0 ) out block{a})
0:? 'gl_in' (in 3-element array of block{gl_Position})
0:? 'gl_in' (in 3-element array of block{gl_Position,gl_PointSize})
0:? 'color' (in 3-element array of 4-component vector of float)
0:? 'color2' (in 3-element array of 4-component vector of float)
0:? 'colorS' (in 3-element array of 4-component vector of float)