HLSL: add implicit promotions for assignments and function returns.

2016-08-09 11:28:03 -06:00
parent 426542ba57
commit c4a1307403
8 changed files with 1940 additions and 4 deletions
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -2446,7 +2446,7 @@ bool HlslGrammar::acceptJumpStatement(TIntermNode*& statement)
        TIntermTyped* node;
        if (acceptExpression(node)) {
            // hook it up
-            statement = intermediate.addBranch(EOpReturn, node, token.loc);
+            statement = parseContext.handleReturnValue(token.loc, node);
        } else
            statement = intermediate.addBranch(EOpReturn, token.loc);
        break;