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

@@ -7,8 +7,8 @@ ERROR: 0:18: '' : constant expression required
ERROR: 0:18: '' : array size must be a constant integer expression
ERROR: 0:19: '' : constant expression required
ERROR: 0:19: '' : array size must be a constant integer expression
ERROR: 0:27: '=' : global const initializers must be constant 'const structure{v3,iv2}'
ERROR: 0:33: '=' : global const initializers must be constant 'const structure{v3,iv2,m}'
ERROR: 0:27: '=' : global const initializers must be constant 'const structure{3-component vector of float v3, 2-component vector of int iv2}'
ERROR: 0:33: '=' : global const initializers must be constant 'const structure{3-component vector of float v3, 2-component vector of int iv2, 2X4 matrix of float m}'
ERROR: 9 compilation errors. No code generated.
@@ -26,8 +26,8 @@ ERROR: node is still EOpNull!
0:? 'constInt' (const int)
0:? 3 (const int)
0:? 'uniformInt' (uniform int)
0:? 's' (structure{v3,iv2})
0:? 's2' (structure{v3,iv2,m})
0:? 's' (structure{3-component vector of float v3, 2-component vector of int iv2})
0:? 's2' (structure{3-component vector of float v3, 2-component vector of int iv2, 2X4 matrix of float m})
0:? 'f' (const float)
0:? 3.000000