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

070aaeaf · John Kessenich · 35682b59 · 070aaeaf · 070aaeaf
Commit 070aaeaf authored Dec 15, 2017 by John Kessenich
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

hlsl.boolConv.vert.out Test/baseResults/hlsl.boolConv.vert.out +0 -0

Intermediate.cpp glslang/MachineIndependent/Intermediate.cpp +5 -0

No files found.
--- a/Test/baseResults/hlsl.boolConv.vert.out
+++ b/Test/baseResults/hlsl.boolConv.vert.out
--- 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: