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

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
}
}