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

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

10
Test/baseResults/430.vert.out
View File

@@ -22,8 +22,8 @@ ERROR: node is still EOpNull!
0:16 Sequence
0:16 move second child to first child (float)
0:16 direct index (float)
0:16 gl_ClipDistance: direct index for structure (17-element array of float)
0:16 '__anon__0' (out block{17-element array of float gl_ClipDistance, })
0:16 gl_ClipDistance: direct index for structure (out 17-element array of float)
0:16 '__anon__0' (out block{out 17-element array of float gl_ClipDistance, })
0:16 Constant:
0:16 2 (const uint)
0:16 Constant:
@@ -39,9 +39,9 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'v4' (layout(location=3 ) 4-component vector of float)
0:? 'uv4' (layout(location=4 ) uniform 4-component vector of float)
0:? 'b1' (layout(location=2 ) in block{layout(location=2 ) 4-component vector of float v})
0:? 'b2' (layout(location=2 ) out block{layout(location=2 ) 4-component vector of float v})
0:? '__anon__0' (out block{17-element array of float gl_ClipDistance, })
0:? 'b1' (layout(location=2 ) in block{in 4-component vector of float v})
0:? 'b2' (layout(location=2 ) out block{out 4-component vector of float v})
0:? '__anon__0' (out block{out 17-element array of float gl_ClipDistance, })
0:? 'cs' (layout(location=10 ) smooth out 2-element array of structure{7-element array of 3X2 matrix of float m, float f})
0:? 'cf' (layout(location=54 ) smooth out float)
0:? 'cg' (layout(location=53 ) smooth out float)