Allow GLSL construction of matrix from matrix, starting with version 120, and…

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

Allow GLSL construction of matrix from matrix, starting with version 120, and…
71fca670 · John Kessenich · f792295e · 71fca670 · 71fca670
Commit 71fca670 authored Feb 12, 2013 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

120.frag Test/120.frag +3 -0

ParseHelper.cpp glslang/MachineIndependent/ParseHelper.cpp +2 -2

No files found.
--- a/Test/120.frag
+++ b/Test/120.frag
@@ -9,6 +9,9 @@ float precision;
 in vec4 i;
 out vec4 o;

+uniform mat4x2 m;
+
 void main()
 {
+    mat2x3 m23 = mat2x3(m);
 }
--- 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) {