Fix non-square matrix vertex attributes.

src/libGLESv2/DynamicHLSL.cpp

@@ -393,9 +393,9 @@ std::string DynamicHLSL::generateInputLayoutHLSL(const VertexFormat inputLayout[
             }
 
             initHLSL += ";\n";
-        }
 
-        inputIndex += VariableRowCount(shaderAttribute.type);
+            inputIndex += VariableRowCount(TransposeMatrixType(shaderAttribute.type));
+        }
     }
 
     return "struct VS_INPUT\n"

src/libGLESv2/ProgramBinary.cpp

@@ -61,14 +61,16 @@ void GetInputLayoutFromShader(const std::vector<sh::Attribute> &shaderAttributes
 
         if (shaderAttr.type != GL_NONE)
         {
-            for (size_t rowIndex = 0; static_cast<int>(rowIndex) < VariableRowCount(shaderAttr.type); rowIndex++, layoutIndex++)
+            GLenum transposedType = TransposeMatrixType(shaderAttr.type);
+
+            for (size_t rowIndex = 0; static_cast<int>(rowIndex) < VariableRowCount(transposedType); rowIndex++, layoutIndex++)
             {
                 VertexFormat *defaultFormat = &inputLayout[layoutIndex];
 
-                defaultFormat->mType = UniformComponentType(shaderAttr.type);
+                defaultFormat->mType = UniformComponentType(transposedType);
                 defaultFormat->mNormalized = false;
                 defaultFormat->mPureInteger = (defaultFormat->mType != GL_FLOAT); // note: inputs can not be bool
-                defaultFormat->mComponents = VariableColumnCount(shaderAttr.type);
+                defaultFormat->mComponents = VariableColumnCount(transposedType);
             }
         }
     }