Fix non-square matrix vertex attributes.

When we generate an input signature for a vertex shader, we should use the transpose of the matrix type instead of the matrix type itself. This was breaking dEQP tests 'shaders.functions.datatypes'. BUG=angle:594 Change-Id: Ia945ffd865d7255500f7a62394bcd5bdfbbedef4 Reviewed-on: https://chromium-review.googlesource.com/191461Reviewed-by: Geoff Lang <geofflang@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>

Fix non-square matrix vertex attributes.
ac0a267b · Jamie Madill · 12bea0a9 · ac0a267b · ac0a267b
Commit ac0a267b authored Apr 11, 2014 by Jamie Madill
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

DynamicHLSL.cpp src/libGLESv2/DynamicHLSL.cpp +2 -2

ProgramBinary.cpp src/libGLESv2/ProgramBinary.cpp +5 -3

No files found.
--- a/src/libGLESv2/DynamicHLSL.cpp
+++ b/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"

--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/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);
            }
        }
    }