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

Fix #2005. Allow multiple compilation units to declare identical push_constant blocks (#2123)

Browse Source 
* Fixes #2005

Allow multiple units in a stage to have push_constants as long
as the blocks match.
Requires #2006 to be fixed to be functional.

* tweaks to #2005 fix after some testing

* add unit tests for push constants across multiple compilation units

For #2005

* update reference output for tests that fail validation

* fix uninitialized result.validationResult
This commit is contained in:
Malcolm Bechard
2020-03-16 10:51:15 -04:00
committed by GitHub
parent 9b620aa0c1
commit 4b2483ee88
14 changed files with 503 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
Test/baseResults/link.vk.differentPC.1.0.frag.out Executable file
View File

@@ -0,0 +1,97 @@
link.vk.differentPC.1.0.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:12 Function Definition: getScale( ( global highp float)
0:12 Function Parameters:
0:14 Sequence
0:14 Branch: Return with expression
0:14 scale: direct index for structure (layout( column_major std430 offset=32) uniform highp float)
0:14 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2})
0:14 Constant:
0:14 2 (const int)
0:? Linker Objects
0:? 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2})
link.vk.differentPC.1.1.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:11 Function Definition: getColor2( ( global highp 4-component vector of float)
0:11 Function Parameters:
0:13 Sequence
0:13 Branch: Return with expression
0:13 color2: direct index for structure (layout( column_major std430 offset=16) uniform highp 4-component vector of float)
0:13 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
0:13 Constant:
0:13 1 (const int)
0:? Linker Objects
0:? 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
link.vk.differentPC.1.2.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:15 Function Definition: main( ( global void)
0:15 Function Parameters:
0:17 Sequence
0:17 move second child to first child ( temp highp 4-component vector of float)
0:17 'color' (layout( location=0) out highp 4-component vector of float)
0:17 add ( temp highp 4-component vector of float)
0:17 color: direct index for structure (layout( column_major std430 offset=0) uniform highp 4-component vector of float)
0:17 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
0:17 Constant:
0:17 0 (const int)
0:17 vector-scale ( temp highp 4-component vector of float)
0:17 Function Call: getColor2( ( global highp 4-component vector of float)
0:17 Function Call: getScale( ( global highp float)
0:? Linker Objects
0:? 'color' (layout( location=0) out highp 4-component vector of float)
0:? 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
Linked fragment stage:
ERROR: Linking fragment stage: Types must match:
uPC: "layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2}" versus "layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale}"
ERROR: Linking fragment stage: Types must match:
uPC: "layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2}" versus "layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale}"
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:12 Function Definition: getScale( ( global highp float)
0:12 Function Parameters:
0:14 Sequence
0:14 Branch: Return with expression
0:14 scale: direct index for structure (layout( column_major std430 offset=32) uniform highp float)
0:14 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2})
0:14 Constant:
0:14 2 (const int)
0:11 Function Definition: getColor2( ( global highp 4-component vector of float)
0:11 Function Parameters:
0:13 Sequence
0:13 Branch: Return with expression
0:13 color2: direct index for structure (layout( column_major std430 offset=16) uniform highp 4-component vector of float)
0:13 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
0:13 Constant:
0:13 1 (const int)
0:15 Function Definition: main( ( global void)
0:15 Function Parameters:
0:17 Sequence
0:17 move second child to first child ( temp highp 4-component vector of float)
0:17 'color' (layout( location=0) out highp 4-component vector of float)
0:17 add ( temp highp 4-component vector of float)
0:17 color: direct index for structure (layout( column_major std430 offset=0) uniform highp 4-component vector of float)
0:17 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale})
0:17 Constant:
0:17 0 (const int)
0:17 vector-scale ( temp highp 4-component vector of float)
0:17 Function Call: getColor2( ( global highp 4-component vector of float)
0:17 Function Call: getScale( ( global highp float)
0:? Linker Objects
0:? 'uPC' (layout( column_major std430 push_constant) uniform block{layout( column_major std430 offset=0) uniform highp 4-component vector of float color, layout( column_major std430 offset=16) uniform highp 4-component vector of float color2, layout( column_major std430 offset=32) uniform highp float scale, layout( column_major std430 offset=36) uniform highp float scale2})
0:? 'color' (layout( location=0) out highp 4-component vector of float)
Validation failed
SPIR-V is not generated for failed compile or link