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

@ -129,20 +129,20 @@ ERROR: node is still EOpNull!
0:29 'b' (mediump int)
0:29 Constant:
0:29 3 (const int)
0:36 move second child to first child (structure{f,a})
0:36 's1' (structure{f,a})
0:36 's2' (structure{f,a})
0:36 move second child to first child (structure{mediump float f, 10-element array of mediump float a})
0:36 's1' (structure{mediump float f, 10-element array of mediump float a})
0:36 's2' (structure{mediump float f, 10-element array of mediump float a})
0:37 Test condition and select (void)
0:37 Condition
0:37 Compare Equal (bool)
0:37 's1' (structure{f,a})
0:37 's2' (structure{f,a})
0:37 's1' (structure{mediump float f, 10-element array of mediump float a})
0:37 's2' (structure{mediump float f, 10-element array of mediump float a})
0:37 true case is null
0:38 Test condition and select (void)
0:38 Condition
0:38 Compare Not Equal (bool)
0:38 's1' (structure{f,a})
0:38 's2' (structure{f,a})
0:38 's1' (structure{mediump float f, 10-element array of mediump float a})
0:38 's2' (structure{mediump float f, 10-element array of mediump float a})
0:38 true case is null
0:40 'b' (mediump int)
0:54 Function Definition: foo10( (void)
@ -325,7 +325,7 @@ ERROR: node is still EOpNull!
0:? 'uint' (mediump int)
0:? 'v' (smooth in 3-element array of mediump 4-component vector of float)
0:? 'f' (mediump float)
0:? '__anon__0' (layout(column_major shared ) uniform block{x})
0:? '__anon__0' (layout(column_major shared ) uniform block{layout(column_major shared ) mediump int x})
0:? 'fa' (unsized array of mediump float)
0:? 'f13' (mediump float)
0:? 'fi' (invariant mediump float)
@ -343,7 +343,7 @@ ERROR: node is still EOpNull!
0:? 'f123' (mediump float)
0:? 'f124' (mediump float)
0:? 'sCube' (uniform lowp samplerCube)
0:? 's' (smooth in structure{f})
0:? 's' (smooth in structure{mediump float f})
Linked fragment stage: