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

Merge pull request #309 from jekstrand/sampler-params

Browse Source 
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
parent 747c328ce4 76d0ac1a6f
commit 7d8141987c
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SPIRV/GlslangToSpv.cpp
View File

@@ -2652,12 +2652,13 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
std::vector<spv::Id> rValues; std::vector<spv::Id> rValues;
std::vector<const glslang::TType*> argTypes; std::vector<const glslang::TType*> argTypes;
for (int a = 0; a < (int)glslangArgs.size(); ++a) { for (int a = 0; a < (int)glslangArgs.size(); ++a) {
const glslang::TType& paramType = glslangArgs[a]->getAsTyped()->getType();
// build l-value // build l-value
builder.clearAccessChain(); builder.clearAccessChain();
glslangArgs[a]->traverse(this); glslangArgs[a]->traverse(this);
argTypes.push_back(&glslangArgs[a]->getAsTyped()->getType()); argTypes.push_back(&paramType);
// keep outputs as l-values, evaluate input-only as r-values // keep outputs as and samplers l-values, evaluate input-only as r-values
if (qualifiers[a] != glslang::EvqConstReadOnly) { if (qualifiers[a] != glslang::EvqConstReadOnly || paramType.getBasicType() == glslang::EbtSampler) {
// save l-value // save l-value
lValues.push_back(builder.getAccessChain()); lValues.push_back(builder.getAccessChain());
} else { } else {
@@ -2674,10 +2675,14 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
int rValueCount = 0; int rValueCount = 0;
std::vector<spv::Id> spvArgs; std::vector<spv::Id> spvArgs;
for (int a = 0; a < (int)glslangArgs.size(); ++a) { for (int a = 0; a < (int)glslangArgs.size(); ++a) {
const glslang::TType& paramType = glslangArgs[a]->getAsTyped()->getType();
spv::Id arg; spv::Id arg;
if (qualifiers[a] != glslang::EvqConstReadOnly) { if (paramType.getBasicType() == glslang::EbtSampler) {
builder.setAccessChain(lValues[lValueCount]);
arg = builder.accessChainGetLValue();
++lValueCount;
} else if (qualifiers[a] != glslang::EvqConstReadOnly) {
// need space to hold the copy // need space to hold the copy
const glslang::TType& paramType = glslangArgs[a]->getAsTyped()->getType();
arg = builder.createVariable(spv::StorageClassFunction, convertGlslangToSpvType(paramType), "param"); arg = builder.createVariable(spv::StorageClassFunction, convertGlslangToSpvType(paramType), "param");
if (qualifiers[a] == glslang::EvqIn || qualifiers[a] == glslang::EvqInOut) { if (qualifiers[a] == glslang::EvqIn || qualifiers[a] == glslang::EvqInOut) {
// need to copy the input into output space // need to copy the input into output space

8
Test/baseResults/spv.subpass.frag.out
View File

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