Commit 5f116e5d by Jamie Madill

Fix regression with GetNextGLSLAttributeType.

A refactoring bug slipped in that used the non-transposed row count for non-square matrices, causing an ASSERT failure in Debug. It's unfortunately not easy to revert the previous change, so instead fix it here. BUG=angleproject:1129 Change-Id: I0de66de46a24b402c93da68f189a2c65616c2006 Reviewed-on: https://chromium-review.googlesource.com/294641Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d538e56e
...@@ -58,7 +58,7 @@ GLenum GetNextGLSLAttributeType(const std::vector<sh::Attribute> &linkedAttribut ...@@ -58,7 +58,7 @@ GLenum GetNextGLSLAttributeType(const std::vector<sh::Attribute> &linkedAttribut
} }
GLenum transposedType = gl::TransposeMatrixType(attrib.type); GLenum transposedType = gl::TransposeMatrixType(attrib.type);
subIndex += gl::VariableRowCount(attrib.type); subIndex += gl::VariableRowCount(transposedType);
if (subIndex > index) if (subIndex > index)
{ {
return transposedType; return transposedType;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment