Add redeclarations of built-in blocks.

Note: lots of test results changed due to listing the members of a block when printing types.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23682 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-10-24 01:25:40 +00:00
parent 94fdd1117b
commit ab41fe5df6
44 changed files with 528 additions and 324 deletions

View file

@ -10,7 +10,7 @@ ERROR: 0:29: 'constructor' : cannot convert parameter 2 from 'const 2X2 matrix
ERROR: 0:29: 'const 2-element array of 4-component vector of float' : cannot construct with these arguments
ERROR: 0:29: '=' : cannot convert from 'const float' to '2-element array of 4-component vector of float'
ERROR: 0:30: 'initializer list' : wrong number of matrix columns: 4X2 matrix of float
ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'float' to 'structure'
ERROR: 0:40: 'constructor' : cannot convert parameter 1 from 'float' to 'structure{s,t}'
ERROR: 0:58: 'initializer list' : wrong number of structure members
ERROR: 13 compilation errors. No code generated.
@ -24,14 +24,14 @@ ERROR: node is still EOpNull!
0:4 0.000000
0:4 1.000000
0:15 Sequence
0:15 move second child to first child (structure)
0:15 'e' (structure)
0:15 move second child to first child (structure{a,b})
0:15 'e' (structure{a,b})
0:15 Constant:
0:15 1.200000
0:15 2 (const int)
0:20 Sequence
0:20 move second child to first child (structure)
0:20 'e2' (structure)
0:20 move second child to first child (structure{a,b})
0:20 'e2' (structure{a,b})
0:20 Constant:
0:20 1.000000
0:20 3 (const int)
@ -82,7 +82,7 @@ ERROR: node is still EOpNull!
0:74 0.000000
0:74 6.000000
0:74 0.000000
0:74 'curlybad1' (structure)
0:74 'curlybad1' (structure{uv2,s})
0:74 true case is null
0:76 Test condition and select (void)
0:76 Condition
@ -105,16 +105,16 @@ ERROR: node is still EOpNull!
0:? 'b2' (2-component vector of float)
0:? 'c2' (3X3 matrix of float)
0:? 'd' (2X2 matrix of float)
0:? 'e' (structure)
0:? 'e2' (structure)
0:? 'e3' (structure)
0:? 'e' (structure{a,b})
0:? 'e2' (structure{a,b})
0:? 'e3' (structure{a,b})
0:? 'a3' (int)
0:? 'b3' (2-element array of 4-component vector of float)
0:? 'b4' (2-element array of 4-component vector of float)
0:? 'c3' (4X2 matrix of float)
0:? 'd2' (unsized array of structure)
0:? 'd2' (unsized array of structure{s,t})
0:? 'b5' (5-element array of float)
0:? 'constructed' (const structure)
0:? 'constructed' (const structure{uv2,s})
0:? 1 (const uint)
0:? 2 (const uint)
0:? 3.000000
@ -131,8 +131,8 @@ ERROR: node is still EOpNull!
0:? 0.000000
0:? 6.000000
0:? 0.000000
0:? 'curlybad1' (structure)
0:? 'curlyInit' (const structure)
0:? 'curlybad1' (structure{uv2,s})
0:? 'curlyInit' (const structure{uv2,s})
0:? 1 (const uint)
0:? 2 (const uint)
0:? 3.000000