mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add redeclarations of built-in blocks.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

26
Test/baseResults/specExamples.vert.out
View File

@@ -223,8 +223,8 @@ ERROR: node is still EOpNull!
0:170 'img2' (coherent uniform image2D)
0:? Sequence
0:178 Sequence
0:178 move second child to first child (structure)
0:178 'lightVar' (structure)
0:178 move second child to first child (structure{intensity,position})
0:178 'lightVar' (structure{intensity,position})
0:178 Constant:
0:178 3.000000
0:178 1.000000
@@ -274,26 +274,26 @@ ERROR: node is still EOpNull!
0:194 Constant:
0:194 0.000000
0:? Linker Objects
0:? 'Coords' (out block)
0:? '__anon__0' (out block)
0:? 'transforms' (layout(column_major shared ) uniform 4-element array of block)
0:? 'Coords' (out block{Position,Texture})
0:? '__anon__0' (out block{Color})
0:? 'transforms' (layout(column_major shared ) uniform 4-element array of block{ModelViewMatrix,ModelViewProjectionMatrix,a,Deformation})
0:? 'normal' (layout(location=3 ) in 4-component vector of float)
0:? 'colors' (layout(location=6 ) in 3-element array of 4-component vector of float)
0:? 's' (layout(location=3 ) structure)
0:? 's' (layout(location=3 ) structure{a1,b,c})
0:? 'var1' (smooth out 4-component vector of float)
0:? '__anon__1' (out block)
0:? '__anon__1' (out block{var2,var3,var4})
0:? 'var5' (smooth out 4-component vector of float)
0:? '__anon__2' (out block)
0:? '__anon__2' (out block{var6})
0:? 'var7' (smooth out 4-component vector of float)
0:? '__anon__3' (layout(row_major std140 ) uniform block)
0:? '__anon__4' (layout(column_major shared ) uniform block)
0:? '__anon__3' (layout(row_major std140 ) uniform block{M1,M2,N1})
0:? '__anon__4' (layout(column_major shared ) uniform block{M13,m14,N12})
0:? 's17' (layout(binding=3 ) uniform sampler2D)
0:? 'a2' (layout(binding=2 ) uniform int)
0:? 'bar' (layout(binding=2 ) uniform int)
0:? 'b2' (layout(binding=2 ) uniform int)
0:? 'c2' (layout(binding=3 ) uniform int)
0:? 'd2' (layout(binding=2 ) uniform int)
0:? '__anon__5' (out block)
0:? '__anon__5' (out block{gl_Position,gl_PointSize,gl_ClipDistance,gl_ClipVertex,gl_FrontColor,gl_BackColor,gl_FrontSecondaryColor,gl_BackSecondaryColor,gl_TexCoord,gl_FogFragCoord})
0:? 'ColorInv' (smooth out 3-component vector of float)
0:? 'Color4' (invariant centroid smooth out 3-component vector of float)
0:? 'position' (smooth out 4-component vector of float)
@@ -303,8 +303,8 @@ ERROR: node is still EOpNull!
0:? 'c' (in 4-component vector of float)
0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float)
0:? '__anon__6' (layout(row_major shared ) coherent uniform block)
0:? '__anon__7' (layout(row_major shared ) uniform block)
0:? '__anon__6' (layout(row_major shared ) coherent uniform block{member1,member2})
0:? '__anon__7' (layout(row_major shared ) uniform block{member1A,member2A})
0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D)
0:? 'img2' (coherent uniform image2D)