HLSL: Intercept flatten aggregates passed to a function input, and copy member-by-member.

Test/hlsl.entry-in.frag

@@ -4,10 +4,17 @@ struct InParam {
     int2 i2;
 };
 
+float fun(InParam p)
+{
+    return p.v.y + p.fragCoord.x;
+}
+
 float4 PixelShaderFunction(InParam i) : COLOR0
 {
     InParam local;
     local = i;
+    float ret1 = fun(local);
+    float ret2 = fun(i);
 
-    return local.fragCoord;
+    return local.fragCoord * ret1 * ret2;
 }

glslang/Include/revision.h

@@ -3,4 +3,4 @@
 // For the date, it uses the current date (when then script is run).
 
 #define GLSLANG_REVISION "Overload400-PrecQual.1493"
-#define GLSLANG_DATE "18-Sep-2016"
+#define GLSLANG_DATE "19-Sep-2016"

hlsl/hlslParseHelper.cpp

@@ -2241,6 +2241,16 @@ TIntermTyped* HlslParseContext::handleLengthMethod(const TSourceLoc& loc, TFunct
 void HlslParseContext::addInputArgumentConversions(const TFunction& function, TIntermNode*& arguments) const
 {
     TIntermAggregate* aggregate = arguments->getAsAggregate();
+    const auto setArg = [&](int argNum, TIntermNode* arg) {
+        if (function.getParamCount() == 1)
+            arguments = arg;
+        else {
+            if (aggregate)
+                aggregate->getSequence()[argNum] = arg;
+            else
+                arguments = arg;
+        }
+    };
 
     // Process each argument's conversion
     for (int i = 0; i < function.getParamCount(); ++i) {
@@ -2254,16 +2264,20 @@ void HlslParseContext::addInputArgumentConversions(const TFunction& function, TI
                 // convert to the correct type.
                 arg = intermediate.addConversion(EOpFunctionCall, *function[i].type, arg);
                 arg = intermediate.addShapeConversion(EOpFunctionCall, *function[i].type, arg);
-                if (arg) {
-                    if (function.getParamCount() == 1)
-                        arguments = arg;
-                    else {
-                        if (aggregate)
-                            aggregate->getSequence()[i] = arg;
-                        else
-                            arguments = arg;
-                    }
-                }
+                setArg(i, arg);
+            }
+        } else {
+            if (shouldFlatten(arg->getType())) {
+                TSourceLoc dummyLoc;
+                dummyLoc.init();
+                TVariable* internalAggregate = makeInternalVariable("aggShadow", *function[i].type);
+                TIntermSymbol* internalSymbolNode = new TIntermSymbol(internalAggregate->getUniqueId(), 
+                                                                      internalAggregate->getName(),
+                                                                      internalAggregate->getType());
+                TIntermAggregate* assignAgg = handleAssign(dummyLoc, EOpAssign, internalSymbolNode, arg)->getAsAggregate();
+                assignAgg = intermediate.growAggregate(assignAgg, internalSymbolNode);
+                assignAgg->setOperator(EOpComma);
+                setArg(i, assignAgg);
             }
         }
     }