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

Have block members use EvqVaryingIn rather than EvqIn, etc., confining the EvqIn-class of qualifier just to parameters and parse time (before it's known if something is a parameter). Also, have member error messages report their actual line, rather than the block's line.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23499 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-10-16 04:08:21 +00:00
parent fb57e7cc5e
commit 457145ded5
7 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/300block.frag.out
View File

@@ -1,6 +1,6 @@
ERROR: 0:10: '' : cannot nest a structure definition inside a structure or block
ERROR: 0:21: '' : cannot nest a structure definition inside a structure or block
ERROR: 0:17: 'sampler' : member of block cannot be a sampler type
ERROR: 0:20: 'sampler' : member of block cannot be a sampler type
ERROR: 0:45: 'variable indexing block array' : not supported with this profile: es
ERROR: 4 compilation errors. No code generated.

6
Test/baseResults/300layout.vert.out
View File

@@ -3,10 +3,10 @@ ERROR: 0:8: 'in' : cannot be a structure or array
ERROR: 0:8: 'vertex input arrays' : not supported with this profile: es
ERROR: 0:12: 'badm4' : cannot specify matrix layout on a variable declaration
ERROR: 0:12: 'badm4' : cannot specify packing on a variable declaration
ERROR: 0:15: 'badf' : member of uniform block cannot have an auxiliary or interpolation qualifier
ERROR: 0:15: 'badg' : member storage qualifier cannot contradict block storage qualifier
ERROR: 0:19: 'badf' : member of uniform block cannot have an auxiliary or interpolation qualifier
ERROR: 0:20: 'badg' : member storage qualifier cannot contradict block storage qualifier
ERROR: 0:28: 'T3' : nameless block contains a member that already has a name at global scope
ERROR: 0:35: 'in/out block' : not supported with this profile: es
ERROR: 0:35: 'output block' : not supported with this profile: es
ERROR: 0:39: 'badoutA' : can only use location layout qualifier on a vertex input or fragment output
ERROR: 0:47: 'shared' : not supported with this profile: es
ERROR: 0:47: 'shared' : not supported in this stage: vertex

10
Test/baseResults/specExamples.frag.out
View File

@@ -4,7 +4,7 @@ ERROR: 0:20: '' : numeric literal too big
ERROR: 0:21: '' : hexidecimal literal too big
ERROR: 0:37: 'view' : redefinition
ERROR: 0:68: 'lightPosition' : redefinition
ERROR: 0:71: 'Atten' : member storage qualifier cannot contradict block storage qualifier
ERROR: 0:75: 'Atten' : member storage qualifier cannot contradict block storage qualifier
ERROR: 0:87: 'Color' : redefinition
ERROR: 0:92: 'origin_upper_left' : unrecognized layout identifier
ERROR: 0:93: 'pixel_center_integer' : unrecognized layout identifier
@@ -48,10 +48,10 @@ ERROR: 0:198: 'e' : redefinition
ERROR: 0:217: '=' : cannot convert from 'const float' to 'unsized array of float'
ERROR: 0:219: '=' : cannot convert from 'unsized array of float' to '5-element array of float'
ERROR: 0:223: '=' : assigning non-constant to 'const float'
ERROR: 0:226: 'in' : only allowed at global scope
ERROR: 0:227: 'in' : only allowed at global scope
ERROR: 0:228: 'in' : only allowed at global scope
ERROR: 0:232: 'out' : only allowed at global scope
ERROR: 0:226: 'in' : not allowed in nested scope
ERROR: 0:227: 'in' : not allowed in nested scope
ERROR: 0:228: 'in' : not allowed in nested scope
ERROR: 0:232: 'out' : not allowed in nested scope
ERROR: 53 compilation errors. No code generated.
ERROR: node is still EOpNull!