HLSL: Fix boolean conversion bug and add more tests for ?:.

Null-conversion needs the right sized vectors to kick out with matching types.
2017-04-11 20:17:23 -06:00
parent 636b62db8b
commit b5e739c20e
4 changed files with 626 additions and 472 deletions
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -4536,7 +4536,7 @@ TIntermTyped* HlslParseContext::convertConditionalExpression(const TSourceLoc& l
        return nullptr;
    }

-    return intermediate.addConversion(EOpConstructBool, TType(EbtBool), condition);
+    return intermediate.addConversion(EOpConstructBool, TType(EbtBool, EvqTemporary, condition->getVectorSize()), condition);
 }

 //