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

Re-allow non-language characters in ES 100 comments, including '\', except for '\' just before a new line.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24331 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-12-04 17:23:03 +00:00
parent 34bd4fbef7
commit e1f0f5b31f
11 changed files with 56 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/100Limits.vert
View File

@@ -36,7 +36,7 @@ void main()
for ( int a = 0; a <= 20; a++) { if (ga==0) a = 4; } // ERROR
for (float a = 0.0; a <= 20.0; a += 2.0);
for (float a = 0.0; a != 20.0; a -= 2.0) { if (ga==0) ga = 4; }
for (float a = 0.0; a == 20.0; a--) for (float a = 0.0; a == 20.0; a--); // two different a, everything okay
for (float a = 0.0; a == 20.0; a--) for (float a = 0.0; a == 20.0; a--); // two different 'a's, everything okay
for (float a = 0.0; a <= 20.0; a += 2.0);
for (float a = 0.0; a <= 20.0; a += 2.0);
for (float a = 0.0; a > 2.0 * 20.0; a += v3.y);

10
Test/100scope.vert
View File

@@ -18,8 +18,8 @@ float b(int a); // ERROR: redefinition
float f; // ERROR: redefinition
float tan; // okay, built-in is in an outer scope
float sin(float x); // ERROR: cant redefine built-in functions
float cos(float x) // ERROR: cant redefine built-in functions
float sin(float x); // ERROR: can't redefine built-in functions
float cos(float x) // ERROR: can't redefine built-in functions
{
return 1.0;
}
@@ -54,7 +54,7 @@ void main()
int z = z; // ERROR: z not previously defined.
}
{
int x = x; // x is initialized to 1
int x = x; // x is initialized to '1'
}
struct S
@@ -62,7 +62,7 @@ void main()
int x;
};
{
S S = S(0); // S is only visible as a struct and constructor
S.x; // S is now visible as a variable
S S = S(0); // 'S' is only visible as a struct and constructor
S.x; // 'S' is now visible as a variable
}
}

10
Test/baseResults/lineContinuation100.vert.out
View File

@@ -8,15 +8,7 @@ ERROR: 0:14: 'line continuation' : not supported for this version or the enabled
ERROR: 0:15: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:18: '#error' : e3
ERROR: 0:24: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:28: 'line continuation' : not supported for this version or the enabled extensions
ERROR: 0:29: 'non-language character ($) in comment' : not supported for this version or the enabled extensions
ERROR: 0:29: 'non-language character (") in comment' : not supported for this version or the enabled extensions
ERROR: 0:29: 'non-language character (') in comment' : not supported for this version or the enabled extensions
ERROR: 0:31: 'non-language character (@) in comment' : not supported for this version or the enabled extensions
ERROR: 0:32: 'non-language character (@) in comment' : not supported for this version or the enabled extensions
ERROR: 0:32: 'non-language character (@) in comment' : not supported for this version or the enabled extensions
ERROR: 0:33: 'non-language character (@) in comment' : not supported for this version or the enabled extensions
ERROR: 17 compilation errors. No code generated.
ERROR: 9 compilation errors. No code generated.
ERROR: node is still EOpNull!

2
Test/lineContinuation100.vert
View File

@@ -6,7 +6,7 @@ ains no errors other than the #error which are there to see if line numbering fo
#error e1
float f\
oo; // same as float foo;
oo; // same as 'float foo;'
#error e2