Allow GLSL construction of matrix from matrix, starting with version 120, and always for ES shaders.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20544 e7fa87d3-cd2b-0410-9028-fcbf551c1848
2013-02-12 08:02:20 +00:00
parent f792295e35
commit 71fca670f3
2 changed files with 5 additions and 2 deletions
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -587,8 +587,8 @@ bool TParseContext::constructorErrorCheck(int line, TIntermNode* node, TFunction
    }

    if (matrixInMatrix && !type->isArray()) {
-        error(line, "constructing matrix from matrix", "constructor", "(reserved)");
-        return true;
+        profileRequires(line, ENoProfile, 120, 0, "constructing matrix from matrix");
+        return false;
    }

    if (overFull) {