Commit d8edb518 by Geoff Lang

Allow OutputGLSL to write non-square matrices.

Fixes assertion failures when ShaderGL fails to compile the generated shaders. BUG=angleproject:882 BUG=angleproject:1149 Change-Id: Ib7c23a54bdb81852864d792f29c89644084859a3 Reviewed-on: https://chromium-review.googlesource.com/297085Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 6e36042f
...@@ -1190,6 +1190,10 @@ TString TOutputGLSLBase::getTypeName(const TType &type) ...@@ -1190,6 +1190,10 @@ TString TOutputGLSLBase::getTypeName(const TType &type)
{ {
out << "mat"; out << "mat";
out << type.getNominalSize(); out << type.getNominalSize();
if (type.getSecondarySize() != type.getNominalSize())
{
out << "x" << type.getSecondarySize();
}
} }
else if (type.isVector()) else if (type.isVector())
{ {
......
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