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

Don't allow invariant in a function.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24009 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-11-11 23:51:57 +00:00
parent e74fe56b02
commit 09709c1521
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Test/baseResults/100.frag.out
View File

@ -24,10 +24,13 @@ ERROR: 0:47: 'invariant' : can only apply to an output or an input in a non-vert
ERROR: 0:50: 'invariant' : can only apply to an output or an input in a non-vertex stage ERROR: 0:50: 'invariant' : can only apply to an output or an input in a non-vertex stage
ERROR: 0:56: 'invariant' : not allowed in nested scope
ERROR: 0:56: 'invariant' : can only apply to an output or an input in a non-vertex stage ERROR: 0:56: 'invariant' : can only apply to an output or an input in a non-vertex stage
ERROR: 0:57: 'invariant' : not allowed in nested scope
ERROR: 0:57: 'invariant' : can only apply to an output or an input in a non-vertex stage ERROR: 0:57: 'invariant' : can only apply to an output or an input in a non-vertex stage
ERROR: 0:59: 'invariant' : not allowed in nested scope
ERROR: 0:59: 'invariant' : can only apply to an output or an input in a non-vertex stage ERROR: 0:59: 'invariant' : can only apply to an output or an input in a non-vertex stage
ERROR: 0:63: 'invariant' : can only apply to an output or an input in a non-vertex stage ERROR: 0:63: 'invariant' : can only apply to an output or an input in a non-vertex stage
@ -51,7 +54,7 @@ ERROR: 0:111: 'gl_FragDepth' : undeclared identifier
ERROR: 0:134: 'texture3D' : no matching overloaded function found ERROR: 0:134: 'texture3D' : no matching overloaded function found
ERROR: 0:135: 'texture2DProjLod' : no matching overloaded function found ERROR: 0:135: 'texture2DProjLod' : no matching overloaded function found
ERROR: 0:140: '' : syntax error ERROR: 0:140: '' : syntax error
ERROR: 46 compilation errors. No code generated. ERROR: 49 compilation errors. No code generated.
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:3 Sequence 0:3 Sequence

1
glslang/MachineIndependent/glslang.y
View File

@ -1059,6 +1059,7 @@ fully_specified_type
invariant_qualifier invariant_qualifier
: INVARIANT { : INVARIANT {
parseContext.globalCheck($1.loc, "invariant");
parseContext.profileRequires($$.loc, ENoProfile, 120, 0, "invariant"); parseContext.profileRequires($$.loc, ENoProfile, 120, 0, "invariant");
$$.init($1.loc); $$.init($1.loc);
$$.qualifier.invariant = true; $$.qualifier.invariant = true;