BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix slight inconsistencies in which qualifiers are inherited into block members:

Browse source 
- don't inherit 'binding'
 - always set the member storage qualifier, not just when the shader explicitly set it
 - don't include in/out members as objects that are resized by geometry/primitive layout specifiers
As a side effect, this makes built-in redeclarations (like gl_ClipDistance) require in/out.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24674 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2014-01-07 17:44:41 +00:00
parent 7cbfdf4394
commit 5053a39578
30 changed files with 343 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Test/baseResults/300.vert.out
View file

@ -272,14 +272,14 @@ ERROR: node is still EOpNull!
0:? 's' (smooth out structure{highp 3-component vector of float c, highp float f})
0:? 'badsize' (unsized array of highp float)
0:? 'badsize2' (unsized array of highp float)
0:? 'ubInst' (layout(column_major shared ) uniform unsized array of block{layout(column_major shared ) unsized array of highp int a})
0:? 'ubInst' (layout(column_major shared ) uniform unsized array of block{layout(column_major shared ) uniform unsized array of highp int a})
0:? 'okayA' (2-element array of highp float)
0:? 'newV' (smooth out highp 3-component vector of float)
0:? 'invIn' (in highp 4-component vector of float)
0:? 's2' (smooth out structure{highp 3-component vector of float c, highp float f})
0:? 's3' (invariant smooth out structure{highp 3-component vector of float c, highp float f})
0:? 'a' (layout(column_major shared ) uniform block{layout(column_major shared ) highp float f})
0:? '__anon__0' (layout(column_major shared ) uniform block{layout(column_major shared ) bool b23})
0:? 'a' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform highp float f})
0:? '__anon__0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform bool b23})
0:? 's2D' (uniform lowp sampler2D)
0:? 's3D' (uniform lowp sampler3D)
0:? 's2DS' (uniform lowp sampler2DShadow)