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,19 +10,19 @@ ERROR: node is still EOpNull!
0:44 Sequence
0:44 Function Call: texture(is31;vf3; (mediump 4-component vector of int)
0:44 sampler: direct index for structure (lowp isampler3D)
0:44 's' (uniform structure)
0:44 's' (uniform structure{u,v,sampler,w,t})
0:44 Constant:
0:44 2 (const int)
0:44 Construct vec3 (3-component vector of float)
0:44 Convert int to float (float)
0:44 ni: direct index for structure (layout(column_major shared ) mediump int)
0:44 'inst' (layout(column_major shared ) uniform block)
0:44 'inst' (layout(column_major shared ) uniform block{nbv,ni})
0:44 Constant:
0:44 1 (const int)
0:44 Convert uint to float (float)
0:44 direct index (mediump uint)
0:44 bv: direct index for structure (layout(column_major shared ) mediump 4-component vector of uint)
0:44 '__anon__0' (layout(column_major shared ) uniform block)
0:44 '__anon__0' (layout(column_major shared ) uniform block{bv,bm2,sampler,t,fbs})
0:44 Constant:
0:44 0 (const uint)
0:44 Constant:
@ -30,27 +30,27 @@ ERROR: node is still EOpNull!
0:44 Convert uint to float (float)
0:44 direct index (mediump uint)
0:44 nbv: direct index for structure (layout(column_major shared ) mediump 4-component vector of uint)
0:44 direct index (layout(column_major shared ) uniform block)
0:44 'insts' (layout(column_major shared ) uniform 4-element array of block)
0:44 direct index (layout(column_major shared ) uniform block{nbv,ni})
0:44 'insts' (layout(column_major shared ) uniform 4-element array of block{nbv,ni})
0:44 Constant:
0:44 2 (const int)
0:44 Constant:
0:44 0 (const int)
0:44 Constant:
0:44 2 (const int)
0:45 indirect index (layout(column_major shared ) uniform block)
0:45 'insts' (layout(column_major shared ) uniform 4-element array of block)
0:45 indirect index (layout(column_major shared ) uniform block{nbv,ni})
0:45 'insts' (layout(column_major shared ) uniform 4-element array of block{nbv,ni})
0:45 direct index (mediump uint)
0:45 v: direct index for structure (mediump 4-component vector of uint)
0:45 's' (uniform structure)
0:45 's' (uniform structure{u,v,sampler,w,t})
0:45 Constant:
0:45 1 (const int)
0:45 Constant:
0:45 0 (const int)
0:? Linker Objects
0:? 's' (uniform structure)
0:? '__anon__0' (layout(column_major shared ) uniform block)
0:? 'inst' (layout(column_major shared ) uniform block)
0:? 'insts' (layout(column_major shared ) uniform 4-element array of block)
0:? '__anon__1' (layout(column_major shared ) uniform block)
0:? 's' (uniform structure{u,v,sampler,w,t})
0:? '__anon__0' (layout(column_major shared ) uniform block{bv,bm2,sampler,t,fbs})
0:? 'inst' (layout(column_major shared ) uniform block{nbv,ni})
0:? 'insts' (layout(column_major shared ) uniform 4-element array of block{nbv,ni})
0:? '__anon__1' (layout(column_major shared ) uniform block{f,u})