Fix constructing vectors from matrices.

src/compiler/translator/OutputHLSL.cpp

@@ -3669,7 +3669,14 @@ void OutputHLSL::addConstructor(const TType &type, const TString &name, const TI
 
             constructor += "x" + str(parameterIndex);
 
-            if (parameter.isScalar())
+            if (ctorType.getStruct())
+            {
+                ASSERT(remainingComponents == parameterSize || moreParameters);
+                ASSERT(parameterSize <= remainingComponents);
+
+                remainingComponents -= parameterSize;
+            }
+            else if (parameter.isScalar())
             {
                 remainingComponents -= parameter.getObjectSize();
             }
@@ -3695,12 +3702,37 @@ void OutputHLSL::addConstructor(const TType &type, const TString &name, const TI
                 }
                 else UNREACHABLE();
             }
-            else if (parameter.isMatrix() || parameter.getStruct())
+            else if (parameter.isMatrix())
             {
-                ASSERT(remainingComponents == parameterSize || moreParameters);
-                ASSERT(parameterSize <= remainingComponents);
-                
-                remainingComponents -= parameterSize;
+                int column = 0;
+                while (remainingComponents > 0 && column < parameter.getCols())
+                {
+                    constructor += "[" + str(column) + "]";
+
+                    if (remainingComponents < static_cast<size_t>(parameter.getRows()))
+                    {
+                        switch (remainingComponents)
+                        {
+                          case 1:  constructor += ".x";    break;
+                          case 2:  constructor += ".xy";   break;
+                          case 3:  constructor += ".xyz";  break;
+                          default: UNREACHABLE();
+                        }
+
+                        remainingComponents = 0;
+                    }
+                    else
+                    {
+                        remainingComponents -= parameter.getRows();
+
+                        if (remainingComponents > 0)
+                        {
+                            constructor += ", x" + str(parameterIndex);
+                        }
+                    }
+
+                    column++;
+                }
             }
             else UNREACHABLE();