Track what ins/outs/uniforms are used, so that errors like "declare after use"...

Track what ins/outs/uniforms are used, so that errors like "declare after use" or "can't use both XXX and YYY" can be issued.  So far, used this for invariant, gl_FragColor et. al., and gl_FragCoord use before redeclaration.

Also made all tests in testlist include linker tests.


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

Test/150.frag

@@ -11,4 +11,4 @@ void main()
     vec4 c = gl_FragCoord;
 }
 
-layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;
+layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;  // ERROR, declared after use

Test/150.vert

@@ -11,6 +11,7 @@ void main()
     gl_Position = iv4;
     gl_PointSize = ps;
     gl_ClipDistance[2] = iv4.x;
+    gl_ClipVertex = iv4;
 }
 
 float gl_ClipDistance[4];

Test/330.frag

@@ -7,8 +7,8 @@ varying vec4 varyingVar;
 
 void main()
 {
-    gl_FragColor = varyingVar;
-    gl_FragData[1] = inVar;
+    gl_FragColor = varyingVar;  // link ERROR: user output was used
+    gl_FragData[1] = inVar;     // link ERROR: user output was used
     int buffer = 4;
 }
 
@@ -21,4 +21,5 @@ in gl_PerFragment {
 void foo()
 {
     vec4 c = gl_Color;
+    outVar = inVar;
 }

Test/400.frag

@@ -38,4 +38,4 @@ layout(location = 3) uniform vec3 uv3;
 layout(location = 5) in vec4 gl_Color;      // ERROR, layout
 noperspective in float gl_ClipDistance[4];  // ERROR, can't change qualifier
 
-layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;
+layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;  // ERROR, declared after use

Test/baseResults/100.frag.out

+100.frag
 ERROR: 0:3: '{ } style initializers' : not supported with this profile: es
 ERROR: 0:3: 'initializer' : not supported for this version or the enabled extensions 
 ERROR: 0:3: 'array initializer' : not supported for this version or the enabled extensions 
@@ -63,6 +64,7 @@ ERROR: 0:150: 'floating-point suffix' : not supported for this version or the en
 ERROR: 0:152: '' :  syntax error
 ERROR: 56 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:3  Sequence
 0:3    move second child to first child (3-element array of mediump int)
@@ -280,3 +282,8 @@ ERROR: node is still EOpNull!
 0:?     'f123' (mediump float)
 0:?     'f124' (mediump float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/100Limits.vert.out

+100Limits.vert
+
 0:? Sequence
 0:15  Function Definition: foo(f1; (void)
 0:15    Function Parameters: 
@@ -439,3 +441,8 @@
 0:?       2.000000
 0:?       2.000000
 
+
+Linked vertex stage:
+
+
+

Test/baseResults/100scope.vert.out

+100scope.vert
 ERROR: 0:5: 'a' : redefinition 
 ERROR: 0:17: 'b' : redeclaration of existing name 
 ERROR: 0:19: 'f' : redefinition 
@@ -8,6 +9,7 @@ ERROR: 0:54: 'z' : undeclared identifier
 ERROR: 0:54: 'z' : redefinition 
 ERROR: 8 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:3  Function Definition: f(i1;i1;i1; (highp int)
 0:3    Function Parameters: 
@@ -111,3 +113,8 @@ ERROR: node is still EOpNull!
 0:?     'b' (bool)
 0:?     'tan' (highp float)
 
+
+Linked vertex stage:
+
+
+

Test/baseResults/120.frag.out

+120.frag
 ERROR: 0:9: 'in for stage inputs' : not supported for this version or the enabled extensions 
 ERROR: 0:10: 'out for stage outputs' : not supported for this version or the enabled extensions 
 ERROR: 0:54: '+' :  wrong operand types: no operation '+' exists that takes a left-hand operand of type '2-component vector of float' and a right operand of type '3-component vector of float' (or there is no acceptable conversion)
@@ -31,6 +32,7 @@ ERROR: 0:115: 'return' : void function cannot return a value
 ERROR: 0:125: 'gl_TexCoord' : redeclaration of array with size 
 ERROR: 31 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:21  Function Definition: main( (void)
 0:21    Function Parameters: 
@@ -317,3 +319,10 @@ ERROR: node is still EOpNull!
 0:?     'a' (int)
 0:?     'gl_TexCoord' (smooth in 6-element array of 4-component vector of float)
 
+
+Linked fragment stage:
+
+ERROR: Linking fragment stage: Recursion detected:
+    foo(f1; calling foo(f1;
+
+

Test/baseResults/120.vert.out

+120.vert
 ERROR: 0:3: 'in for stage inputs' : not supported for this version or the enabled extensions 
 ERROR: 0:4: 'out for stage outputs' : not supported for this version or the enabled extensions 
 ERROR: 0:11: 'gl_Position' : cannot add storage, auxiliary, memory, interpolation, or precision qualifier to an existing variable 
@@ -44,6 +45,7 @@ ERROR: 0:111: 'overloadE' : no matching overloaded function found
 ERROR: 0:117: 'overloadF' : no matching overloaded function found 
 ERROR: 44 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:15  Function Definition: main( (void)
 0:15    Function Parameters: 
@@ -200,3 +202,8 @@ ERROR: node is still EOpNull!
 0:?     'concall' (const float)
 0:?       0.295520
 
+
+Linked vertex stage:
+
+
+

Test/baseResults/130.frag.out

+130.frag
 Warning, version 130 is not yet complete; most features are present, but a few are missing.
 ERROR: 0:25: 'texture gather function' : not supported for this version or the enabled extensions 
 ERROR: 0:35: 'redeclaration' : cannot change the type of gl_Color
@@ -9,6 +10,7 @@ ERROR: 0:63: '>' :  wrong operand types: no operation '>' exists that takes a le
 ERROR: 0:64: '>=' :  wrong operand types: no operation '>=' exists that takes a left-hand operand of type 'const 2-component vector of uint' and a right operand of type 'const 2-component vector of uint' (or there is no acceptable conversion)
 ERROR: 7 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:16  Function Definition: main( (void)
 0:16    Function Parameters: 
@@ -105,3 +107,8 @@ ERROR: node is still EOpNull!
 0:?     'gl_Color' (smooth in 4-component vector of float)
 0:?     'gl_Color' (flat in 4-component vector of float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/140.frag.out

+140.frag
 Warning, version 140 is not yet complete; most features are present, but a few are missing.
 WARNING: 0:3: varying deprecated in version 130; may be removed in future release
 ERROR: 0:17: '#error' : GL_ES is not set  
 ERROR: 1 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:10  Function Definition: main( (void)
 0:10    Function Parameters: 
@@ -21,3 +23,8 @@ ERROR: node is still EOpNull!
 0:?     'gl_ClipDistance' (smooth in 5-element array of float)
 0:?     'gl_ClipDistance' (smooth in 5-element array of float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/150.frag.out

+150.frag
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:4: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord
 ERROR: 0:5: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord
 ERROR: 0:6: 'layout qualifier' : can only apply origin_upper_left and pixel_center_origin to gl_FragCoord 
-ERROR: 3 compilation errors.  No code generated.
+ERROR: 0:14: 'gl_FragCoord' : cannot redeclare after use 
+ERROR: 4 compilation errors.  No code generated.
+
 
 gl_FragCoord pixel center is integer
 gl_FragCoord origin is upper left
@@ -19,3 +22,8 @@ ERROR: node is still EOpNull!
 0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
 0:?     'foo' (smooth in 4-component vector of float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/150.geom.out

+150.geom
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
 ERROR: 0:15: 'fromVertex' : block instance name redefinition 
 ERROR: 0:19: 'fromVertex' : redefinition 
@@ -29,6 +30,7 @@ ERROR: 0:88: 'invocations' : not supported for this version or the enabled exten
 ERROR: 0:91: 'stream' : member cannot contradict block 
 ERROR: 28 compilation errors.  No code generated.
 
+
 invocations = 4
 max_vertices = 127
 input primitive = lines_adjancency
@@ -139,3 +141,8 @@ ERROR: node is still EOpNull!
 0:?     '__anon__3' (layout(stream=3 ) out block{f15})
 0:?     '__anon__4' (layout(column_major shared ) uniform block{b15})
 
+
+Linked geometry stage:
+
+
+

Test/baseResults/150.vert.out

+150.vert
 Warning, version 150 is not yet complete; some version-specific features are present, but many are missing.
-ERROR: 0:21: 'a' : cannot redeclare a user-block member array 
+ERROR: 0:22: 'a' : cannot redeclare a user-block member array 
 ERROR: 1 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:9  Function Definition: main( (void)
 0:9    Function Parameters: 
@@ -30,6 +32,12 @@ ERROR: node is still EOpNull!
 0:13          'iv4' (in 4-component vector of float)
 0:13          Constant:
 0:13            0 (const int)
+0:14      move second child to first child (4-component vector of float)
+0:14        gl_ClipVertex: direct index for structure (gl_ClipVertex 4-component vector of float)
+0:14          '__anon__0' (out block{gl_Position,gl_PointSize,gl_ClipDistance,gl_ClipVertex,gl_FrontColor,gl_BackColor,gl_FrontSecondaryColor,gl_BackSecondaryColor,gl_TexCoord,gl_FogFragCoord})
+0:14          Constant:
+0:14            3 (const uint)
+0:14        'iv4' (in 4-component vector of float)
 0:?   Linker Objects
 0:?     'iv4' (in 4-component vector of float)
 0:?     'ps' (uniform float)
@@ -37,3 +45,9 @@ ERROR: node is still EOpNull!
 0:?     'gl_VertexID' (gl_VertexId int)
 0:?     'gl_InstanceID' (gl_InstanceId int)
 
+
+Linked vertex stage:
+
+ERROR: Linking vertex stage: Can only use one of gl_ClipDistance or gl_ClipVertex (gl_ClipDistance is preferred)
+
+

Test/baseResults/300.frag.out

+300.frag
 ERROR: 0:30: 'noperspective' : Reserved word. 
 ERROR: 0:30: 'noperspective' : not supported with this profile: es
 ERROR: 0:31: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: bads
@@ -28,6 +29,7 @@ ERROR: 0:126: 'imageBuffer' : Reserved word.
 ERROR: 0:126: '' :  syntax error
 ERROR: 28 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:53  Function Definition: main( (void)
 0:53    Function Parameters: 
@@ -289,3 +291,9 @@ ERROR: node is still EOpNull!
 0:?     'st1' (uniform structure{i,s})
 0:?     'st2' (uniform structure{i,s})
 
+
+Linked fragment stage:
+
+ERROR: Linking fragment stage: when more than one fragment shader output, all must have location qualifiers
+
+

Test/baseResults/300.vert.out

+300.vert
 ERROR: 0:8: 'varying' : Reserved word. 
 ERROR: 0:8: 'varying' : no longer supported in es profile; removed in version 300
 ERROR: 0:9: 'vertex input arrays' : not supported with this profile: es
@@ -18,12 +19,14 @@ ERROR: 0:63: '' : array size required
 ERROR: 0:65: '' : array size required 
 ERROR: 0:64: '' : array size required 
 ERROR: 0:67: '' : array size required 
+ERROR: 0:76: 'invariant' : cannot change qualification after use 
 ERROR: 0:78: 'invariant' : can only apply to an output: invIn
 ERROR: 0:88: 'ub2' : Cannot reuse block name within the same interface: uniform
 ERROR: 0:92: 'ub2' : Cannot reuse block name within the same interface: uniform
 ERROR: 0:96: 'ub2' : Cannot reuse block name within the same interface: uniform
 ERROR: 0:104: 'ub3' : Cannot reuse block name within the same interface: uniform
-ERROR: 25 compilation errors.  No code generated.
+ERROR: 26 compilation errors.  No code generated.
+
 
 ERROR: node is still EOpNull!
 0:27  Function Definition: main( (void)
@@ -175,3 +178,8 @@ ERROR: node is still EOpNull!
 0:?     'gl_VertexID' (gl_VertexId highp int)
 0:?     'gl_InstanceID' (gl_InstanceId highp int)
 
+
+Linked vertex stage:
+
+
+

Test/baseResults/300BuiltIns.frag.out

+300BuiltIns.frag
 ERROR: 0:6: 'float' : type requires declaration of default precision qualifier 
 ERROR: 0:70: 'noise2' : no matching overloaded function found 
 ERROR: 2 compilation errors.  No code generated.
 
+
 ERROR: node is still EOpNull!
 0:26  Function Definition: main( (void)
 0:26    Function Parameters: 
@@ -204,3 +206,8 @@ ERROR: node is still EOpNull!
 0:?     'v2b' (mediump 2-component vector of float)
 0:?     'v4' (mediump 4-component vector of float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/300block.frag.out

+300block.frag
 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: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.
 
+
 ERROR: node is still EOpNull!
 0:42  Function Definition: main( (void)
 0:42    Function Parameters: 
@@ -54,3 +56,8 @@ ERROR: node is still EOpNull!
 0:?     'insts' (layout(column_major shared ) uniform 4-element array of block{nbv,ni})
 0:?     '__anon__1' (layout(column_major shared ) uniform block{f,u})
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/300layout.frag.out

+300layout.frag
 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!
 0:10  Function Definition: main( (void)
 0:10    Function Parameters: 
@@ -24,3 +26,8 @@ ERROR: node is still EOpNull!
 0:?     'p' (layout(location=3 ) out mediump 4-component vector of float)
 0:?     'q' (layout(location=4 ) out 2-element array of mediump 4-component vector of float)
 
+
+Linked fragment stage:
+
+
+

Test/baseResults/300layout.vert.out

+300layout.vert
 ERROR: 0:7: 'vertex input arrays' : not supported with this profile: es
 ERROR: 0:8: 'in' : cannot be a structure or array 
 ERROR: 0:8: 'vertex input arrays' : not supported with this profile: es
@@ -12,6 +13,7 @@ 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.
 
+
 ERROR: node is still EOpNull!
 0:41  Function Definition: main( (void)
 0:41    Function Parameters: 
@@ -68,3 +70,8 @@ ERROR: node is still EOpNull!
 0:?     'gl_VertexID' (gl_VertexId highp int)
 0:?     'gl_InstanceID' (gl_InstanceId highp int)
 
+
+Linked vertex stage:
+
+
+