Minor infrastructure changes, to simplify an upcoming check in:

- 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

View File

@@ -47,8 +47,8 @@ ERROR: node is still EOpNull!
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 direct index (block{4-component vector of float gl_Position, float gl_PointSize})
0:26 'gl_in' (in 3-element array of block{4-component vector of float gl_Position, float gl_PointSize})
0:26 Constant:
0:26 1 (const int)
0:26 Constant:
@@ -72,8 +72,8 @@ ERROR: node is still EOpNull!
0:51 Constant:
0:51 3 (const int)
0:? Linker Objects
0:? 'bn' (in 3-element array of block{a})
0:? 'gl_in' (in 3-element array of block{gl_Position,gl_PointSize})
0:? 'bn' (in 3-element array of block{int a})
0:? 'gl_in' (in 3-element array of block{4-component vector of float gl_Position, float 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)
@@ -85,8 +85,8 @@ ERROR: node is still EOpNull!
0:? 'patchIn' (patch in 3-element array of 4-component vector of float)
0:? 'patchOut' (layout(stream=0 ) patch out 4-component vector of float)
0:? 'scalar' (in float)
0:? 'inbls' (in block{a})
0:? 'inbla' (in 17-element array of block{a})
0:? 'inbls' (in block{int a})
0:? 'inbla' (in 17-element array of block{int a})
Linked geometry stage: