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

Minor infrastructure changes, to simplify an upcoming check in:

Browse Source 
- print out block member types when printing a block (makes all test results change)
 - const versions of all intermediate.h type-identification methods
 - layoutSlotLocation -> layoutLocation

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24664 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-01-06 21:27:56 +00:00
parent 7054075804
commit 7cbfdf4394
50 changed files with 592 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Test/baseResults/410.geom.out
View File

@@ -4,7 +4,7 @@ ERROR: 0:8: 'myIn' : cannot redeclare a built-in block with a user name
ERROR: 0:12: 'gl_myIn' : no declaration found for redeclaration
ERROR: 0:20: 'gl_PerVertex' : can only redeclare a built-in block once, and before any use
ERROR: 0:32: 'gl_Position' : no such field in structure
ERROR: 0:32: '=' : cannot convert from 'block{gl_PointSize}' to '4-component vector of float'
ERROR: 0:32: '=' : cannot convert from 'block{float gl_PointSize}' to '4-component vector of float'
ERROR: 0:33: 'gl_Position' : member of nameless block was not redeclared
ERROR: 0:33: 'assign' : cannot convert from 'const 4-component vector of float' to 'layout(stream=0 ) gl_Position void'
ERROR: 7 compilation errors. No code generated.
@@ -29,25 +29,25 @@ ERROR: node is still EOpNull!
0:30 move second child to first child (float)
0:30 'p' (float)
0:30 gl_PointSize: direct index for structure (float)
0:30 direct index (block{gl_PointSize})
0:30 'gl_in' (in unsized array of block{gl_PointSize})
0:30 direct index (block{float gl_PointSize})
0:30 'gl_in' (in unsized array of block{float gl_PointSize})
0:30 Constant:
0:30 1 (const int)
0:30 Constant:
0:30 0 (const int)
0:31 move second child to first child (float)
0:31 gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize float)
0:31 '__anon__0' (layout(stream=0 ) out block{gl_PointSize,})
0:31 '__anon__0' (layout(stream=0 ) out block{layout(stream=0 ) gl_PointSize float gl_PointSize, })
0:31 Constant:
0:31 1 (const uint)
0:31 'p' (float)
0:33 gl_Position: direct index for structure (layout(stream=0 ) gl_Position void)
0:33 '__anon__0' (layout(stream=0 ) out block{gl_PointSize,})
0:33 '__anon__0' (layout(stream=0 ) out block{layout(stream=0 ) gl_PointSize float gl_PointSize, })
0:33 Constant:
0:33 0 (const uint)
0:? Linker Objects
0:? 'gl_in' (in unsized array of block{gl_PointSize})
0:? '__anon__0' (layout(stream=0 ) out block{gl_PointSize,})
0:? 'gl_in' (in unsized array of block{float gl_PointSize})
0:? '__anon__0' (layout(stream=0 ) out block{layout(stream=0 ) gl_PointSize float gl_PointSize, })
Linked geometry stage: