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

@ -138,13 +138,13 @@ ERROR: node is still EOpNull!
0:50 1 (const int)
0:52 move second child to first child (highp 3-component vector of float)
0:52 c: direct index for structure (highp 3-component vector of float)
0:52 's' (smooth out structure{c,f})
0:52 's' (smooth out structure{highp 3-component vector of float c, highp float f})
0:52 Constant:
0:52 0 (const int)
0:52 'v3' (in highp 3-component vector of float)
0:53 move second child to first child (highp float)
0:53 f: direct index for structure (highp float)
0:53 's' (smooth out structure{c,f})
0:53 's' (smooth out structure{highp 3-component vector of float c, highp float f})
0:53 Constant:
0:53 1 (const int)
0:53 'dm' (highp float)
@ -269,23 +269,23 @@ ERROR: node is still EOpNull!
0:? 'rep' (smooth flat out highp 4-component vector of float)
0:? 'rep2' (centroid smooth sample out highp 4-component vector of float)
0:? 'rep3' (in highp 4-component vector of float)
0:? 's' (smooth out structure{c,f})
0:? 's' (smooth out structure{highp 3-component vector of float c, highp float f})
0:? 'badsize' (unsized array of highp float)
0:? 'badsize2' (unsized array of highp float)
0:? 'ubInst' (layout(column_major shared ) uniform unsized array of block{a})
0:? 'ubInst' (layout(column_major shared ) uniform unsized array of block{layout(column_major shared ) unsized array of highp int a})
0:? 'okayA' (2-element array of highp float)
0:? 'newV' (smooth out highp 3-component vector of float)
0:? 'invIn' (in highp 4-component vector of float)
0:? 's2' (smooth out structure{c,f})
0:? 's3' (invariant smooth out structure{c,f})
0:? 'a' (layout(column_major shared ) uniform block{f})
0:? '__anon__0' (layout(column_major shared ) uniform block{b23})
0:? 's2' (smooth out structure{highp 3-component vector of float c, highp float f})
0:? 's3' (invariant smooth out structure{highp 3-component vector of float c, highp float f})
0:? 'a' (layout(column_major shared ) uniform block{layout(column_major shared ) highp float f})
0:? '__anon__0' (layout(column_major shared ) uniform block{layout(column_major shared ) bool b23})
0:? 's2D' (uniform lowp sampler2D)
0:? 's3D' (uniform lowp sampler3D)
0:? 's2DS' (uniform lowp sampler2DShadow)
0:? 's2DAS' (uniform lowp sampler2DArrayShadow)
0:? 'c2D' (in highp 2-component vector of float)
0:? 'ssss' (smooth out structure{f})
0:? 'ssss' (smooth out structure{highp float f})
0:? 'gl_VertexID' (gl_VertexId highp int)
0:? 'gl_InstanceID' (gl_InstanceId highp int)