HLSL: Fix #1192: when bool operands are converted to ints, convert result type.

2017-12-15 21:46:09 -07:00 · 2017-12-15 21:46:09 -07:00 · 070aaeafcd
commit 070aaeafcd
parent 35682b5926
2 changed files with 181 additions and 206 deletions
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@ -2474,6 +2474,11 @@ bool TIntermediate::promoteBinary(TIntermBinary& node)
                return false;
            node.setLeft(left);
            node.setRight(right);
+
+            // Update the original base assumption on result type..
+            node.setType(left->getType());
+            node.getWritableType().getQualifier().clear();
+
            break;

        default: