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

Add layout binding qualifier for blocks and samplers (atomics are not yet in, nor link validation).

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23590 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-10-18 21:37:55 +00:00
parent 8f13e1322d
commit ab3080353a
8 changed files with 155 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Test/420.vert
View File

@@ -62,3 +62,12 @@ void bar(in highp volatile vec4 v)
f.xxxxx; // ERROR
f.xxy; // ERROR
}
layout(binding = 3) uniform; // ERROR
layout(binding = 3) uniform boundblock { int aoeu; } boundInst;
layout(binding = 7) uniform anonblock { int aoeu; } ;
layout(location = 1) in; // ERROR
layout(binding = 1) in inblock { int aoeua; }; // ERROR
layout(binding = 100000) uniform anonblock2 { int aooeu; } ;
layout(binding = 4) uniform sampler2D sampb1;
layout(binding = 5) uniform sampler2D sampb2[10];

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

@@ -1,4 +1,4 @@
ERROR: 0:4: 'color' : can only use location layout qualifier on a vertex input or fragment output
ERROR: 0:4: 'input location layout qualifier' : not supported in this stage: fragment
ERROR: 1 compilation errors. No code generated.
ERROR: node is still EOpNull!

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

@@ -7,7 +7,7 @@ ERROR: 0:19: 'badf' : member of uniform block cannot have an auxiliary or interp
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: '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:39: 'output location layout qualifier' : not supported in this stage: vertex
ERROR: 0:47: 'shared' : not supported with this profile: es
ERROR: 0:47: 'shared' : not supported in this stage: vertex
ERROR: 12 compilation errors. No code generated.
@@ -33,11 +33,11 @@ ERROR: node is still EOpNull!
0:43 Constant:
0:43 1 (const int)
0:43 M4: direct index for structure (layout(row_major shared ) highp 4X4 matrix of float)
0:43 '__anon__1' (layout(shared ) uniform block)
0:43 '__anon__1' (layout(column_major shared ) uniform block)
0:43 Constant:
0:43 1 (const uint)
0:43 M3: direct index for structure (layout(column_major shared ) highp 4X4 matrix of float)
0:43 '__anon__1' (layout(shared ) uniform block)
0:43 '__anon__1' (layout(column_major shared ) uniform block)
0:43 Constant:
0:43 0 (const uint)
0:43 t2m: direct index for structure (layout(row_major shared ) highp 4X4 matrix of float)

12
Test/baseResults/420.vert.out
View File

@@ -20,7 +20,11 @@ ERROR: 0:44: '=' : cannot convert from 'float' to 'int'
ERROR: 0:54: 'y' : vector field selection out of range
ERROR: 0:62: 'xxxxx' : illegal vector field selection
ERROR: 0:63: 'xxy' : vector field selection out of range
ERROR: 20 compilation errors. No code generated.
ERROR: 0:66: 'binding' : cannot declare a default, include a type or full declaration
ERROR: 0:69: 'location' : cannot declare a default, use a full declaration
ERROR: 0:70: 'binding' : requires uniform or buffer storage qualifier
ERROR: 0:71: 'binding' : binding is too large
ERROR: 24 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:20 Function Definition: foo( (const int)
@@ -112,6 +116,12 @@ ERROR: node is still EOpNull!
0:? 4.200000
0:? 'dx' (const float)
0:? 4.200000
0:? 'boundInst' (layout(binding=3 shared ) uniform block)
0:? '__anon__0' (layout(binding=7 shared ) uniform block)
0:? '__anon__1' (layout(binding=1 ) in block)
0:? '__anon__2' (layout(shared ) uniform block)
0:? 'sampb1' (layout(binding=4 ) uniform sampler2D)
0:? 'sampb2' (layout(binding=5 ) uniform 10-element array of sampler2D)
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)

33
Test/baseResults/specExamples.vert.out
View File

@@ -15,23 +15,20 @@ ERROR: 0:46: 'stream' : there is no such layout identifier taking an assigned va
ERROR: 0:47: 'stream' : there is no such layout identifier taking an assigned value
ERROR: 0:50: 'stream' : there is no such layout identifier taking an assigned value
ERROR: 0:55: 'stream' : there is no such layout identifier taking an assigned value
ERROR: 0:77: 'binding' : not supported
ERROR: 0:80: 's17' : redefinition
ERROR: 0:85: 'binding' : not supported
ERROR: 0:85: 'offset' : there is no such layout identifier taking an assigned value
ERROR: 0:87: 'binding' : not supported
ERROR: 0:89: 'binding' : not supported
ERROR: 0:85: 'binding' : requires block, or sampler/image, or atomic-counter type
ERROR: 0:87: 'binding' : requires block, or sampler/image, or atomic-counter type
ERROR: 0:89: 'offset' : there is no such layout identifier taking an assigned value
ERROR: 0:91: 'binding' : not supported
WARNING: 0:89: '' : cannot set qualifier defaults when using a type and no identifier
ERROR: 0:91: 'bar' : redefinition
ERROR: 0:92: 'offset' : there is no such layout identifier taking an assigned value
ERROR: 0:92: 'bar' : redefinition
ERROR: 0:94: 'binding' : not supported
ERROR: 0:94: 'offset' : there is no such layout identifier taking an assigned value
ERROR: 0:94: 'a2' : redefinition
ERROR: 0:95: 'binding' : not supported
ERROR: 0:96: 'binding' : not supported
ERROR: 0:97: 'binding' : not supported
ERROR: 0:95: 'binding' : requires block, or sampler/image, or atomic-counter type
ERROR: 0:96: 'binding' : requires block, or sampler/image, or atomic-counter type
ERROR: 0:97: 'binding' : requires block, or sampler/image, or atomic-counter type
ERROR: 0:106: '' : vertex input cannot be further qualified
ERROR: 0:112: 'ColorIvn' : identifier not previously declared
ERROR: 0:132: 'shared' : not supported in this stage: vertex
@@ -43,7 +40,7 @@ ERROR: 0:153: '' : function does not return a value: func3
ERROR: 0:192: 'constructor' : constructing from a non-dereferenced array
ERROR: 0:193: 'constructor' : constructing from a non-dereferenced array
ERROR: 0:194: 'constructor' : constructing from a non-dereferenced array
ERROR: 44 compilation errors. No code generated.
ERROR: 40 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:134 Function Definition: funcA(I21; (4-component vector of float)
@@ -289,13 +286,13 @@ ERROR: node is still EOpNull!
0:? '__anon__2' (out block)
0:? 'var7' (smooth out 4-component vector of float)
0:? '__anon__3' (layout(std140 ) uniform block)
0:? '__anon__4' (layout(shared ) uniform block)
0:? 's17' (uniform sampler2D)
0:? 'a2' (uniform int)
0:? 'bar' (uniform int)
0:? 'b2' (uniform int)
0:? 'c2' (uniform int)
0:? 'd2' (uniform int)
0:? '__anon__4' (layout(column_major shared ) uniform block)
0:? 's17' (layout(binding=3 ) uniform sampler2D)
0:? 'a2' (layout(binding=2 ) uniform int)
0:? 'bar' (layout(binding=2 ) uniform int)
0:? 'b2' (layout(binding=2 ) uniform int)
0:? 'c2' (layout(binding=3 ) uniform int)
0:? 'd2' (layout(binding=2 ) uniform int)
0:? '__anon__5' (out block)
0:? 'ColorInv' (smooth out 3-component vector of float)
0:? 'Color4' (invariant centroid smooth out 3-component vector of float)
@@ -306,7 +303,7 @@ ERROR: node is still EOpNull!
0:? 'c' (in 4-component vector of float)
0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float)
0:? '__anon__6' (layout(shared ) uniform block)
0:? '__anon__6' (layout(shared ) coherent uniform block)
0:? '__anon__7' (layout(shared ) uniform block)
0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D)