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

SPV: Modify last merge: Have promoteScalar() generate the correct vectorType.

Browse Source
This commit is contained in:
John Kessenich
2015-12-09 19:08:42 -07:00
parent c51710e0a9
commit 76f7139789
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SPIRV/SpvBuilder.cpp
View File

@@ -1174,9 +1174,9 @@ void Builder::promoteScalar(Decoration precision, Id& left, Id& right)
int direction = getNumComponents(right) - getNumComponents(left);
if (direction > 0)
left = smearScalar(precision, left, getTypeId(right));
left = smearScalar(precision, left, makeVectorType(getTypeId(left), getNumComponents(right)));
else if (direction < 0)
right = smearScalar(precision, right, getTypeId(left));
right = smearScalar(precision, right, makeVectorType(getTypeId(right), getNumComponents(left)));
return;
}
@@ -1185,15 +1185,12 @@ void Builder::promoteScalar(Decoration precision, Id& left, Id& right)
Id Builder::smearScalar(Decoration /*precision*/, Id scalar, Id vectorType)
{
assert(getNumComponents(scalar) == 1);
assert(getTypeId(scalar) == getScalarTypeId(vectorType));
int numComponents = getNumTypeComponents(vectorType);
if (numComponents == 1)
return scalar;
// Make new vector type if the provided one is incompatible with type of the scalar
if (getTypeId(scalar) != getScalarTypeId(vectorType))
vectorType = makeVectorType(getTypeId(scalar), numComponents);
Instruction* smear = new Instruction(getUniqueId(), vectorType, OpCompositeConstruct);
for (int c = 0; c < numComponents; ++c)
smear->addIdOperand(scalar);