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

Merge pull request #187 from amdrexu/bugfix

Browse Source 
SPV: Continue to fix the issue of bool -> uint32
This commit is contained in:
John Kessenich
2016-03-03 21:59:21 -07:00
parent be0fa3c4c0 b4fd8d10f0
commit 2ac71dfb78
3 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/GlslangToSpv.cpp
View File

@@ -3878,7 +3878,7 @@ spv::Id TGlslangToSpvTraverser::createShortCircuit(glslang::TOperator op, glslan
// emit left operand
builder.clearAccessChain();
left.traverse(this);
spv::Id leftId = builder.accessChainLoad(spv::NoPrecision, boolTypeId);
spv::Id leftId = accessChainLoad(left.getType());
// Operands to accumulate OpPhi operands
std::vector<spv::Id> phiOperands;
@@ -3901,7 +3901,7 @@ spv::Id TGlslangToSpvTraverser::createShortCircuit(glslang::TOperator op, glslan
// emit right operand as the "then" part of the "if"
builder.clearAccessChain();
right.traverse(this);
spv::Id rightId = builder.accessChainLoad(spv::NoPrecision, boolTypeId);
spv::Id rightId = accessChainLoad(right.getType());
// accumulate left operand's phi information
phiOperands.push_back(rightId);