Additional semantic checking for tessellation shaders and related clean up:
- non-arrayed geometry inputs and tessellation-control outputs
- include user blocks in i/o array resizing based on primitive type
- things belonging only to 'in' or 'out' are verified only on 'in' or 'out'
- invocation number changing
- move shader-scoped qualifier checking into its class
- remove an incidental union of two levels of the node hierarchy in the yacc stack
- remove layout(location=) default tracking when setting on a variable
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24551 e7fa87d3-cd2b-0410-9028-fcbf551c1848
diff --git a/Test/400.geom b/Test/400.geom
index 51c78fe..adb29f6 100644
--- a/Test/400.geom
+++ b/Test/400.geom
@@ -6,12 +6,12 @@
EndStreamPrimitive(0);
EmitVertex();
EndPrimitive();
-
int id = gl_InvocationID;
}
-layout(invocations = 3) out outbn { int a; }; // ERROR, not on a block
-layout(max_vertices = 127, invocations = 4) out;
+layout(invocations = 4) in outbn { int a; } bn[]; // ERROR, not on a block
+layout(max_vertices = 127) out;
+layout(invocations = 4) in;
#extension GL_ARB_separate_shader_objects : enable
@@ -55,5 +55,19 @@
layout(location = 5) in vec4 cvb[3];
layout(location = 2) in mat3 cmc[3]; // ERROR, collision
-patch in vec4 patchIn; // ERROR
-patch out vec4 patchOut; // ERROR
\ No newline at end of file
+patch in vec4 patchIn[]; // ERROR
+patch out vec4 patchOut; // ERROR
+
+in float scalar; // ERROR, no array
+
+layout(max_vertices = 127, invocations = 4) out; // ERROR
+layout(invocations = 4, max_vertices = 127) in; // ERROR
+layout(max_vertices = 127, invocations = 4) uniform; // 2 ERRORs
+
+in inblockscalar {
+ int a;
+} inbls; // ERROR, not an array
+
+in inblocka {
+ int a;
+} inbla[17]; // ERROR, wrong array size