Issue #28: Correctly handle a single input argument conversion when the input argument is an aggregate.

2015-07-21 16:00:34 -06:00 · 2015-07-21 16:00:34 -06:00 · 8ba301c7c2
commit 8ba301c7c2
parent efb8461722
3 changed files with 30 additions and 3 deletions
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@ -1239,10 +1239,14 @@ void TParseContext::addInputArgumentConversions(const TFunction& function, TInte
                // convert to the correct type.
                arg = intermediate.addConversion(EOpFunctionCall, *function[i].type, arg);
                if (arg) {
-                    if (aggregate)
-                        aggregate->getSequence()[i] = arg;
-                    else
+                    if (function.getParamCount() == 1)
                        arguments = arg;
+                    else {
+                        if (aggregate)
+                            aggregate->getSequence()[i] = arg;
+                        else
+                            arguments = arg;
+                    }
                }
            }
        }