BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GLSL: Fix #1247. Remove extraneous *= matrix test.

Browse source
This commit is contained in:
John Kessenich 2018-02-15 12:22:25 -07:00
parent 98e3fb1926
commit b587fb6208
5 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
glslang/MachineIndependent/Intermediate.cpp
View file

@ -2706,7 +2706,7 @@ bool TIntermediate::promoteBinary(TIntermBinary& node)
node.setOp(op = EOpMatrixTimesScalarAssign);
}
} else if (left->isMatrix() && right->isMatrix()) {
if (left->getMatrixCols() != left->getMatrixRows() || left->getMatrixCols() != right->getMatrixCols() || left->getMatrixCols() != right->getMatrixRows())
if (left->getMatrixCols() != right->getMatrixCols() || left->getMatrixCols() != right->getMatrixRows())
return false;
node.setOp(op = EOpMatrixTimesMatrixAssign);
} else if (!left->isMatrix() && !right->isMatrix()) {