Tie "location = " to the right stages/versions/extensions. Also add "#define extension 1" extension support and instructions.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23633 e7fa87d3-cd2b-0410-9028-fcbf551c1848

Test/400.frag

@@ -22,3 +22,13 @@ void main()
     iv4 = textureGatherOffset(isamp2DA, vec3(0.1), ivec2(1), 1+2);
     iv4 = textureGatherOffset(isamp2DA, vec3(0.1), ivec2(i));
 }
+
+layout(location = 4) in vec4 vl; // ERROR, not supported
+
+#ifdef GL_ARB_separate_shader_objects
+#extension GL_ARB_separate_shader_objects : enable
+#endif
+
+layout(location = 4) in vec4 vl2;
+
+layout(location = 3) uniform vec3 uv3;

Test/430.comp

@@ -8,3 +8,5 @@ void main()
 	memoryBarrierImage();
 	groupMemoryBarrier();
 }
+
+layout(location = 2) in vec3 v3;

Test/430.vert

@@ -0,0 +1,8 @@
+#version 430 core
+
+layout(location = 3) vec4 v4;  // ERROR
+
+layout(location = 3) uniform vec4 uv4;
+
+layout(location = 2) in   inb1 { vec4 v; } b1;  // ERROR
+layout(location = 2) out outb1 { vec4 v; } b2;  // ERROR

Test/baseResults/300layout.frag.out

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

Test/baseResults/300layout.vert.out

@@ -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: 'output location layout qualifier' : not supported in this stage: vertex
+ERROR: 0:39: 'location qualifier on output' : 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.

Test/baseResults/400.frag.out

@@ -1,7 +1,9 @@
 Warning, version 400 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:20: 'texture gather component' : must be a constant 
 ERROR: 0:21: 'texture gather component' : must be 0, 1, 2, or 3 
-ERROR: 2 compilation errors.  No code generated.
+ERROR: 0:26: 'location qualifier on input' : not supported for this version or the enabled extensions 
+ERROR: 0:34: 'location qualifier on uniform or buffer' : not supported for this version or the enabled extensions 
+ERROR: 4 compilation errors.  No code generated.
 
 ERROR: node is still EOpNull!
 0:10  Function Definition: main( (void)
@@ -110,4 +112,7 @@ ERROR: node is still EOpNull!
 0:?     'arrayedSampler' (uniform 5-element array of sampler2D)
 0:?     'samp2dr' (uniform usampler2DRect)
 0:?     'isamp2DA' (uniform isampler2DArray)
+0:?     'vl' (layout(location=4 ) smooth in 4-component vector of float)
+0:?     'vl2' (layout(location=4 ) smooth in 4-component vector of float)
+0:?     'uv3' (layout(location=3 ) uniform 3-component vector of float)
 

Test/baseResults/430.comp.out

@@ -1,5 +1,8 @@
 Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
-0:? Sequence
+ERROR: 0:12: 'location qualifier on input' : not supported in this stage: compute
+ERROR: 1 compilation errors.  No code generated.
+
+ERROR: node is still EOpNull!
 0:3  Function Definition: main( (void)
 0:3    Function Parameters: 
 0:5    Sequence
@@ -9,4 +12,5 @@ Warning, version 430 is not yet complete; some version-specific features are pre
 0:8      MemoryBarrierImage (void)
 0:9      GroupMemoryBarrier (void)
 0:?   Linker Objects
+0:?     'v3' (layout(location=2 ) in 3-component vector of float)
 

Test/baseResults/430.vert.out

@@ -0,0 +1,15 @@
+Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
+ERROR: 0:3: 'v4' : location qualifiers only appy to uniform, buffer, in, or out storage qualifiers 
+ERROR: 0:7: 'location qualifier on input block' : not supported for this version or the enabled extensions 
+ERROR: 0:8: 'location qualifier on output block' : not supported for this version or the enabled extensions 
+ERROR: 3 compilation errors.  No code generated.
+
+ERROR: node is still EOpNull!
+0:?   Linker Objects
+0:?     'v4' (layout(location=3 ) 4-component vector of float)
+0:?     'uv4' (layout(location=3 ) uniform 4-component vector of float)
+0:?     'b1' (layout(location=2 ) in block)
+0:?     'b2' (layout(location=2 ) out block)
+0:?     'gl_VertexID' (gl_VertexId int)
+0:?     'gl_InstanceID' (gl_InstanceId int)
+

Test/baseResults/specExamples.vert.out

@@ -1,6 +1,6 @@
 Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:23: 'transforms' : redeclaration of array with size 
-ERROR: 0:29: 's' : location qualifiers only appy to uniform, in, or out storage qualifiers 
+ERROR: 0:29: 's' : location qualifiers only appy to uniform, buffer, in, or out storage qualifiers 
 ERROR: 0:31: 'triangles' : unrecognized layout identifier 
 ERROR: 0:31: 'invocations' : there is no such layout identifier taking an assigned value 
 ERROR: 0:33: 'lines' : unrecognized layout identifier 

Test/testlist

@@ -55,6 +55,7 @@ numeral.frag
 400.tese
 410.geom
 420.tese
+430.vert
 430.comp
 dce.frag
 ../../LunarGLASS/test/aggOps.frag