mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@20544 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-02-12 08:02:20 +00:00
parent f792295e35
commit 71fca670f3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Test/120.frag
View File

@ -9,6 +9,9 @@ float precision;
in vec4 i; in vec4 i;
out vec4 o; out vec4 o;
uniform mat4x2 m;
void main() void main()
{ {
mat2x3 m23 = mat2x3(m);
} }

4
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -587,8 +587,8 @@ bool TParseContext::constructorErrorCheck(int line, TIntermNode* node, TFunction
} }
if (matrixInMatrix && !type->isArray()) { if (matrixInMatrix && !type->isArray()) {
error(line, "constructing matrix from matrix", "constructor", "(reserved)"); profileRequires(line, ENoProfile, 120, 0, "constructing matrix from matrix");
return true; return false;
} }
if (overFull) { if (overFull) {