Issue #28: Correctly handle a single input argument conversion when the input argumen...

diff --git a/Test/baseResults/functionSemantics.frag.out b/Test/baseResults/functionSemantics.frag.out
index 7117352..63cde49 100644 (file)
--- a/Test/baseResults/functionSemantics.frag.out
+++ b/Test/baseResults/functionSemantics.frag.out
@@ -187,6 +187,14 @@ Shader version: 400
 0:62        Construct vec4 (temp 4-component vector of float)\r
 0:62          Convert int to float (temp float)\r
 0:62            'color' (temp int)\r
+0:66  Function Definition: aggCall( (global void)\r
+0:66    Function Parameters: \r
+0:?     Sequence\r
+0:69      Function Call: m(vf2; (global 3-component vector of float)\r
+0:69        Convert int to float (temp 2-component vector of float)\r
+0:69          Construct ivec2 (temp 2-component vector of int)\r
+0:69            Convert float to int (temp int)\r
+0:69              'F' (temp float)\r
 0:?   Linker Objects\r
 0:?     'u' (uniform float)\r
 \r
@@ -380,6 +388,14 @@ Shader version: 400
 0:62        Construct vec4 (temp 4-component vector of float)\r
 0:62          Convert int to float (temp float)\r
 0:62            'color' (temp int)\r
+0:66  Function Definition: aggCall( (global void)\r
+0:66    Function Parameters: \r
+0:?     Sequence\r
+0:69      Function Call: m(vf2; (global 3-component vector of float)\r
+0:69        Convert int to float (temp 2-component vector of float)\r
+0:69          Construct ivec2 (temp 2-component vector of int)\r
+0:69            Convert float to int (temp int)\r
+0:69              'F' (temp float)\r
 0:?   Linker Objects\r
 0:?     'u' (uniform float)\r
 \r

diff --git a/Test/functionSemantics.frag b/Test/functionSemantics.frag
index 67ff5f5..15ebc60 100644 (file)
--- a/Test/functionSemantics.frag
+++ b/Test/functionSemantics.frag
@@ -61,3 +61,10 @@ void main()
 \r
     gl_FragColor = vec4(color);\r
 }\r
+\r
+vec3 m(vec2);\r
+void aggCall()\r
+{\r
+    float F;\r
+    m(ivec2(F));  // test input conversion of single argument that's an aggregate; other function tests in 120.vert\r
+}\r

diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index b993ee0..afe2e4a 100644 (file)
--- 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;
+                    }
                 }
             }
         }