Add some missing invariant semantic checks, replace some misplaced sampler semantic checks, add parameter and structure member checks against new qualifiers.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23962 e7fa87d3-cd2b-0410-9028-fcbf551c1848
2013-11-08 07:13:18 +00:00
parent c999ba2816
commit 01c22afa37
15 changed files with 283 additions and 57 deletions
--- a/Test/100.frag
+++ b/Test/100.frag
@@ -43,3 +43,36 @@ void main()

 invariant gl_FragColor;
 float fa[];              // ERROR
+float f13;
+invariant f13;           // ERROR
+struct S { int a; };
+invariant S;
+invariant float fi;      // ERROR
+varying vec4 av;
+invariant av;            // okay in v100
+
+void foo10()
+{
+    invariant f;         // ERROR
+    invariant float f2;  // ERROR
+    float f3;
+    invariant f3;        // ERROR
+}
+
+uniform vec2 uv2;
+invariant uv2;              // ERROR
+invariant uniform vec3 uv3; // ERROR
+
+sampler2D glob2D;           // ERROR
+void f11(sampler2D p2d)
+{
+    sampler2D v2D;          // ERROR
+}
+varying sampler2D vary2D;   // ERROR
+
+struct sp {
+    highp float f;
+    in float g;             // ERROR
+    uniform float h;        // ERROR
+    invariant float i;      // ERROR
+};
--- a/Test/300.frag
+++ b/Test/300.frag
@@ -36,7 +36,7 @@ struct s {
    sampler2D s;
 };

-out s badout;               // ERROR
+in s badout;               // ERROR, can't contain a sampler

 struct S2 {
    vec3 c;
@@ -108,7 +108,19 @@ out vec4 colors[4];
 void foo()
 {
    colors[2] = c4D;
-    colors[ic1D] = c4D;
+    colors[ic1D] = c4D;  // ERROR
+}
+
+uniform s st1;
+uniform s st2;
+
+void foo13(s inSt2)
+{
+    if (st1 == st2);  // ERROR
+    if (st1 != st2);  // ERROR
+    st1.s == st2.s;   // ERROR
+    inSt2 = st1;      // ERROR
+    inSt2 == st1;     // ERROR
 }

 float imageBuffer;    // ERROR, reserved
--- a/Test/300.vert
+++ b/Test/300.vert
@@ -66,3 +66,17 @@ uniform ub {
 } ubInst[];         // ERROR
 void foo(int a[]);  // ERROR
 float okayA[] = float[](3.0, 4.0);  // Okay
+
+out vec3 newV;
+void newVFun()
+{
+    newV = v3;
+}
+
+invariant newV;  // ERROR, variable already used
+in vec4 invIn;
+invariant invIn; // ERROR, in v300
+out S s2;
+invariant s2;
+invariant out S s3;
+flat out int;
--- a/Test/430.vert
+++ b/Test/430.vert
@@ -15,3 +15,19 @@ void foo()
 {
    gl_ClipDistance[2] = 3.7;
 }
+
+struct sp {
+    highp float f;
+    in float g;             // ERROR
+    uniform float h;        // ERROR
+    invariant float i;      // ERROR
+    volatile float j;       // ERROR
+    layout(row_major) mat3 m3; // ERROR
+};
+
+void foo3(invariant vec4 v4,                 // ERROR
+          volatile vec3 v3,
+          layout(location = 3) vec2 v2,      // ERROR
+          centroid vec3 cv3)                 // ERROR
+{
+}
--- a/Test/baseResults/100.frag.out
+++ b/Test/baseResults/100.frag.out
@@ -20,7 +20,27 @@ ERROR: 0:38: 'array comparison' : not supported for this version or the enabled
 ERROR: 0:40: 'switch' : Reserved word. 
 ERROR: 0:40: 'switch statements' : not supported for this version or the enabled extensions 
 ERROR: 0:45: '' : array size required 
-ERROR: 22 compilation errors.  No code generated.
+ERROR: 0:47: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:50: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:56: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:57: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:59: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:63: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:64: 'invariant' : can only apply to an output or an input in a non-vertex stage
+ 
+ERROR: 0:66: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: glob2D
+ERROR: 0:69: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: v2D
+ERROR: 0:71: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: vary2D
+ERROR: 0:75: 'g' : cannot use storage or interpolation qualifiers on structure members 
+ERROR: 0:76: 'h' : cannot use storage or interpolation qualifiers on structure members 
+ERROR: 0:77: 'i' : cannot use invariant qualifier on structure members 
+ERROR: 35 compilation errors.  No code generated.

 ERROR: node is still EOpNull!
 0:3  Sequence
@@ -96,6 +116,11 @@ ERROR: node is still EOpNull!
 0:38          's2' (structure{f,a})
 0:38        true case is null
 0:40      'b' (mediump int)
+0:54  Function Definition: foo10( (void)
+0:54    Function Parameters: 
+0:67  Function Definition: f11(s21; (void)
+0:67    Function Parameters: 
+0:67      'p2d' (in lowp sampler2D)
 0:?   Linker Objects
 0:?     'a' (3-element array of mediump int)
 0:?     'uint' (mediump int)
@@ -103,4 +128,11 @@ ERROR: node is still EOpNull!
 0:?     'f' (mediump float)
 0:?     '__anon__0' (layout(column_major shared ) uniform block{x})
 0:?     'fa' (unsized array of mediump float)
+0:?     'f13' (mediump float)
+0:?     'fi' (invariant mediump float)
+0:?     'av' (smooth in mediump 4-component vector of float)
+0:?     'uv2' (uniform mediump 2-component vector of float)
+0:?     'uv3' (invariant uniform mediump 3-component vector of float)
+0:?     'glob2D' (lowp sampler2D)
+0:?     'vary2D' (smooth in lowp sampler2D)

--- a/Test/baseResults/300.frag.out
+++ b/Test/baseResults/300.frag.out
@@ -1,8 +1,8 @@
 ERROR: 0:30: 'noperspective' : Reserved word. 
 ERROR: 0:30: 'noperspective' : not supported with this profile: es
-ERROR: 0:31: 'sampler/image' : samplers and images must be uniform 
+ERROR: 0:31: 'sampler2D' : sampler/image types can only be used in uniform variables or function parameters: bads
 ERROR: 0:32: 'uint' : cannot apply precision statement to this type; use 'float', 'int' or a sampler type 
-ERROR: 0:39: 'structure' : samplers and images must be uniform (structure cannot contain a sampler or image)
+ERROR: 0:39: 'structure' : non-uniform struct contains a sampler or image: badout
 ERROR: 0:69: 'variable indexing sampler array' : not supported with this profile: es
 ERROR: 0:83: 'double' : Reserved word. 
 ERROR: 0:83: 'double' : not supported with this profile: es
@@ -18,9 +18,15 @@ ERROR: 0:102: 'arrays of arrays' : not supported with this profile: es
 ERROR: 0:103: 'arrays of arrays' : not supported with this profile: es
 ERROR: 0:100: 'arrays of arrays' : not supported with this profile: es
 ERROR: 0:111: 'variable indexing fragment shader ouput array' : not supported with this profile: es
-ERROR: 0:114: 'imageBuffer' : Reserved word. 
-ERROR: 0:114: '' :  syntax error
-ERROR: 22 compilation errors.  No code generated.
+ERROR: 0:119: '==' : can't use with samplers or structs containing samplers 
+ERROR: 0:120: '!=' : can't use with samplers or structs containing samplers 
+ERROR: 0:121: '==' : can't use with samplers or structs containing samplers 
+ERROR: 0:121: '==' :  wrong operand types: no operation '==' exists that takes a left-hand operand of type 'lowp sampler2D' and a right operand of type 'lowp sampler2D' (or there is no acceptable conversion)
+ERROR: 0:122: '=' : can't use with samplers or structs containing samplers 
+ERROR: 0:123: '==' : can't use with samplers or structs containing samplers 
+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)
@@ -223,6 +229,30 @@ ERROR: node is still EOpNull!
 0:111          'colors' (out 4-element array of lowp 4-component vector of float)
 0:111          'ic1D' (flat in mediump int)
 0:111        'c4D' (smooth lowp 4-component vector of float)
+0:117  Function Definition: foo13(struct-s-i1-s211; (void)
+0:117    Function Parameters: 
+0:117      'inSt2' (in structure{i,s})
+0:119    Sequence
+0:119      Test condition and select (void)
+0:119        Condition
+0:119        Compare Equal (bool)
+0:119          'st1' (uniform structure{i,s})
+0:119          'st2' (uniform structure{i,s})
+0:119        true case is null
+0:120      Test condition and select (void)
+0:120        Condition
+0:120        Compare Not Equal (bool)
+0:120          'st1' (uniform structure{i,s})
+0:120          'st2' (uniform structure{i,s})
+0:120        true case is null
+0:121      Constant:
+0:121        false (const bool)
+0:122      move second child to first child (structure{i,s})
+0:122        'inSt2' (in structure{i,s})
+0:122        'st1' (uniform structure{i,s})
+0:123      Compare Equal (bool)
+0:123        'inSt2' (in structure{i,s})
+0:123        'st1' (uniform structure{i,s})
 0:?   Linker Objects
 0:?     's2D' (uniform lowp sampler2D)
 0:?     's3D' (uniform lowp sampler3D)
@@ -249,11 +279,13 @@ ERROR: node is still EOpNull!
 0:?     'ic4D' (flat in mediump 4-component vector of int)
 0:?     'badv' (noperspective in lowp 4-component vector of float)
 0:?     'bads' (smooth in lowp sampler2D)
-0:?     'badout' (out structure{i,s})
+0:?     'badout' (smooth in structure{i,s})
 0:?     's2' (smooth in structure{c,f})
 0:?     'sc' (out lowp 3-component vector of float)
 0:?     'sf' (out lowp float)
 0:?     'arrayedSampler' (uniform 5-element array of lowp sampler2D)
 0:?     'multiInst' (layout(column_major shared ) uniform 2-element array of block{a,b,c})
 0:?     'colors' (out 4-element array of lowp 4-component vector of float)
+0:?     'st1' (uniform structure{i,s})
+0:?     'st2' (uniform structure{i,s})

--- a/Test/baseResults/300.vert.out
+++ b/Test/baseResults/300.vert.out
@@ -18,7 +18,9 @@ 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: 20 compilation errors.  No code generated.
+ERROR: 0:78: 'invariant' : can only apply to an output
+ invIn
+ERROR: 21 compilation errors.  No code generated.

 ERROR: node is still EOpNull!
 0:27  Function Definition: main( (void)
@@ -136,6 +138,12 @@ ERROR: node is still EOpNull!
 0:68      Constant:
 0:68        3.000000
 0:68        4.000000
+0:71  Function Definition: newVFun( (void)
+0:71    Function Parameters: 
+0:73    Sequence
+0:73      move second child to first child (highp 3-component vector of float)
+0:73        'newV' (smooth out highp 3-component vector of float)
+0:73        'v3' (in highp 3-component vector of float)
 0:?   Linker Objects
 0:?     'm43' (uniform highp 4X3 matrix of float)
 0:?     'm33' (uniform highp 3X3 matrix of float)
@@ -155,6 +163,10 @@ ERROR: node is still EOpNull!
 0:?     'badsize2' (unsized array of highp float)
 0:?     'ubInst' (layout(column_major shared ) uniform unsized array of block{a})
 0:?     'okayA' (2-element array of highp float)
+0:?     'newV' (smooth out highp 3-component vector of float)
+0:?     'invIn' (in highp 4-component vector of float)
+0:?     's2' (smooth out structure{c,f})
+0:?     's3' (invariant smooth out structure{c,f})
 0:?     'gl_VertexID' (gl_VertexId highp int)
 0:?     'gl_InstanceID' (gl_InstanceId highp int)

--- a/Test/baseResults/430.vert.out
+++ b/Test/baseResults/430.vert.out
@@ -2,7 +2,15 @@ Warning, version 430 is not yet complete; some version-specific features are pre
 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: 0:21: 'g' : cannot use storage or interpolation qualifiers on structure members 
+ERROR: 0:22: 'h' : cannot use storage or interpolation qualifiers on structure members 
+ERROR: 0:23: 'i' : cannot use invariant qualifier on structure members 
+ERROR: 0:24: 'j' : cannot use memory qualifiers on structure members 
+ERROR: 0:25: 'm3' : cannot use layout qualifiers on structure members 
+ERROR: 0:28: '' : cannot use invariant qualifier on a function parameter 
+ERROR: 0:30: '' : cannot use layout qualifiers on a function parameter 
+ERROR: 0:31: '' : cannot use auxiliary or interpolation qualifiers on a function parameter 
+ERROR: 11 compilation errors.  No code generated.

 ERROR: node is still EOpNull!
 0:14  Function Definition: foo( (void)
@@ -18,6 +26,12 @@ ERROR: node is still EOpNull!
 0:16            2 (const int)
 0:16        Constant:
 0:16          3.700000
+0:31  Function Definition: foo3(vf4;vf3;vf2;vf3; (void)
+0:31    Function Parameters: 
+0:31      'v4' (in 4-component vector of float)
+0:31      'v3' (in 3-component vector of float)
+0:31      'v2' (in 2-component vector of float)
+0:31      'cv3' (in 3-component vector of float)
 0:?   Linker Objects
 0:?     'v4' (layout(location=3 ) 4-component vector of float)
 0:?     'uv4' (layout(location=3 ) uniform 4-component vector of float)
--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
@@ -3,6 +3,8 @@ ERROR: 0:6: '=' :  cannot convert from 'const uint' to 'int'
 ERROR: 0:20: '' : numeric literal too big 
 ERROR: 0:21: '' : hexidecimal literal too big 
 ERROR: 0:37: 'view' : redefinition 
+ERROR: 0:63: 'invariant' : can only apply to an output
+ Color
 ERROR: 0:68: 'lightPosition' : redefinition 
 ERROR: 0:75: 'Atten' : member storage qualifier cannot contradict block storage qualifier 
 ERROR: 0:87: 'Color' : redefinition 
@@ -46,7 +48,7 @@ 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: 47 compilation errors.  No code generated.
+ERROR: 48 compilation errors.  No code generated.

 gl_FragCoord pixel center is integer
 gl_FragCoord origin is upper left