Merge pull request #309 from jekstrand/sampler-params

SPV: Don't shadow sampler parameters when performing function calls
This commit is contained in:
John Kessenich
2016-05-25 17:35:54 -06:00
2 changed files with 12 additions and 11 deletions

View File

@@ -7,7 +7,7 @@ Linked fragment stage:
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 70
// Id's are bound by 68
Capability Shader
Capability InputAttachment
@@ -28,7 +28,6 @@ Linked fragment stage:
Name 54 "ucolor"
Name 57 "usub"
Name 62 "usubMS"
Name 67 "param"
Decorate 30(sub) DescriptorSet 0
Decorate 30(sub) InputAttachmentIndex 1
Decorate 35(subMS) DescriptorSet 0
@@ -81,7 +80,6 @@ Linked fragment stage:
62(usubMS): 61(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
67(param): 8(ptr) Variable Function
31: 28 Load 30(sub)
32: 25(fvec4) ImageRead 31 20
Store 27(color) 32
@@ -106,9 +104,7 @@ Linked fragment stage:
65: 52(ivec4) Load 54(ucolor)
66: 52(ivec4) IAdd 65 64
Store 54(ucolor) 66
68: 7 Load 46(isubMS)
Store 67(param) 68
69: 2 FunctionCall 11(foo(iIPM1;) 67(param)
67: 2 FunctionCall 11(foo(iIPM1;) 46(isubMS)
Return
FunctionEnd
11(foo(iIPM1;): 2 Function None 9