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

Move the complex pieces of C++ code from glslang.y to ParseHelper.cpp. Updated some tests.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22846 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-08-27 05:57:15 +00:00
parent d46b31fdc5
commit 23bdb29eac
6 changed files with 557 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Test/matrixError.vert
View File

@@ -7,16 +7,16 @@ uniform mat3x2 m32;
const mat2x4 m24 = mat2x4(1.0, 2.0,
3.0, 4.0,
3.0, 4.0,
3.0, 4.0, 5.0);
3.0, 4.0, 5.0); // ERROR, too many arguments
void main()
{
mat2x3 m23;
vec3 a, b;
a = v3 * m23;
b = m32 * v3;
m23.xy;
a = v3 * m23; // ERROR, type mismatch
b = m32 * v3; // ERROR, type mismatch
m23.xy; // ERROR, can't use .
gl_Position = vec4(m23 * m32 * v3, m24[2][4]);
gl_Position = vec4(m23 * m32 * v3, m24[2][4]); // ERROR, 2 and 4 are out of range
}