Clean up/resolve a bunch of TODO, which included implementing pixel_center_integer and origin_upper_left and adjusting what versions see legacy texturing names.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23874 e7fa87d3-cd2b-0410-9028-fcbf551c1848
2013-11-05 18:07:25 +00:00
parent c36e1d8e51
commit 8ec55cdcd2
28 changed files with 374 additions and 160 deletions
--- a/Test/130.frag
+++ b/Test/130.frag
@@ -31,3 +31,9 @@ void bar()
 {
    vec4 s = textureGather(sampC, vec3(0.2));
 }
+
+flat in vec3 gl_Color;     // ERROR, type
+in vec4 gl_Color;
+flat in vec4 gl_Color;
+flat in vec4 gl_Color[2];  // ERROR, array 
+vec4 gl_Color;             // ERROR, storage
--- a/Test/150.frag
+++ b/Test/150.frag
@@ -0,0 +1,14 @@
+#version 150 core
+
+in vec4 gl_FragCoord;
+layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;  // ERROR
+layout(pixel_center_integer) in vec4 gl_FragCoord;  // ERROR
+layout(origin_upper_left) in vec4 foo;  // ERROR
+layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;
+
+void main()
+{
+    vec4 c = gl_FragCoord;
+}
+
+layout(origin_upper_left, pixel_center_integer) in vec4 gl_FragCoord;
--- a/Test/300.frag
+++ b/Test/300.frag
@@ -103,5 +103,13 @@ uniform multi {
    int c[2][3];      // ERROR
 } multiInst[2][3];    // ERROR

+out vec4 colors[4];
+
+void foo()
+{
+    colors[2] = c4D;
+    colors[ic1D] = c4D;
+}
+
 float imageBuffer;    // ERROR, reserved
 float uimage2DRect;   // ERROR, reserved
--- a/Test/400.frag
+++ b/Test/400.frag
@@ -21,6 +21,8 @@ void main()
    iv4 = textureGatherOffset(isamp2DA, vec3(0.1), ivec2(1), 4);  // ERROR, last argument out of range
    iv4 = textureGatherOffset(isamp2DA, vec3(0.1), ivec2(1), 1+2);
    iv4 = textureGatherOffset(isamp2DA, vec3(0.1), ivec2(i));
+
+    vec4 c = gl_FragCoord;
 }

 layout(location = 4) in vec4 vl; // ERROR, not supported
@@ -32,3 +34,8 @@ layout(location = 4) in vec4 vl; // ERROR, not supported
 layout(location = 4) in vec4 vl2;

 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;
--- a/Test/baseResults/130.frag.out
+++ b/Test/baseResults/130.frag.out
@@ -1,6 +1,9 @@
 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: 1 compilation errors.  No code generated.
+ERROR: 0:35: 'redeclaration' : cannot change the type of gl_Color
+ERROR: 0:38: 'gl_Color' : redeclaring non-array as array 
+ERROR: 0:39: 'redeclaration' : cannot change storage, memory, or auxiliary qualification of gl_Color
+ERROR: 4 compilation errors.  No code generated.

 ERROR: node is still EOpNull!
 0:16  Function Definition: main( (void)
@@ -48,4 +51,6 @@ ERROR: node is still EOpNull!
 0:?     'fnop' (noperspective in float)
 0:?     'gl_ClipDistance' (smooth in unsized array of float)
 0:?     'sampC' (uniform samplerCube)
+0:?     'gl_Color' (smooth in 4-component vector of float)
+0:?     'gl_Color' (flat in 4-component vector of float)

--- a/Test/baseResults/150.frag.out
+++ b/Test/baseResults/150.frag.out
@@ -0,0 +1,21 @@
+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.
+
+gl_FragCoord pixel center is integer
+gl_FragCoord origin is upper left
+ERROR: node is still EOpNull!
+0:9  Function Definition: main( (void)
+0:9    Function Parameters: 
+0:11    Sequence
+0:11      Sequence
+0:11        move second child to first child (4-component vector of float)
+0:11          'c' (4-component vector of float)
+0:11          'gl_FragCoord' (gl_FragCoord 4-component vector of float)
+0:?   Linker Objects
+0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
+0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
+0:?     'foo' (smooth in 4-component vector of float)
+
--- a/Test/baseResults/150.geom.out
+++ b/Test/baseResults/150.geom.out
@@ -71,7 +71,7 @@ ERROR: node is still EOpNull!
 0:33          Constant:
 0:33            2 (const int)
 0:34      move second child to first child (4-component vector of float)
-0:34        gl_Position: direct index for structure (layout(stream=0 ) 4-component vector of float)
+0:34        gl_Position: direct index for structure (layout(stream=0 ) gl_Position 4-component vector of float)
 0:34          '__anon__1' (layout(stream=0 ) out block{gl_Position,gl_PointSize,gl_ClipDistance})
 0:34          Constant:
 0:34            0 (const uint)
@@ -83,7 +83,7 @@ ERROR: node is still EOpNull!
 0:34          Constant:
 0:34            0 (const int)
 0:35      move second child to first child (float)
-0:35        gl_PointSize: direct index for structure (layout(stream=0 ) float)
+0:35        gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize float)
 0:35          '__anon__1' (layout(stream=0 ) out block{gl_Position,gl_PointSize,gl_ClipDistance})
 0:35          Constant:
 0:35            1 (const uint)
--- a/Test/baseResults/300.frag.out
+++ b/Test/baseResults/300.frag.out
@@ -17,9 +17,10 @@ ERROR: 0:102: 'arrays of arrays' : not supported with this profile: es
 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:106: 'imageBuffer' : Reserved word. 
-ERROR: 0:106: '' :  syntax error
-ERROR: 21 compilation errors.  No code generated.
+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: node is still EOpNull!
 0:53  Function Definition: main( (void)
@@ -208,6 +209,20 @@ ERROR: node is still EOpNull!
 0:96          'c4D' (smooth lowp 4-component vector of float)
 0:97      arc hyp. tangent (lowp 3-component vector of float)
 0:97        'c3D' (smooth in lowp 3-component vector of float)
+0:108  Function Definition: foo( (void)
+0:108    Function Parameters: 
+0:110    Sequence
+0:110      move second child to first child (lowp 4-component vector of float)
+0:110        direct index (lowp 4-component vector of float)
+0:110          'colors' (out 4-element array of lowp 4-component vector of float)
+0:110          Constant:
+0:110            2 (const int)
+0:110        'c4D' (smooth lowp 4-component vector of float)
+0:111      move second child to first child (lowp 4-component vector of float)
+0:111        indirect index (lowp 4-component vector of float)
+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:?   Linker Objects
 0:?     's2D' (uniform lowp sampler2D)
 0:?     's3D' (uniform lowp sampler3D)
@@ -240,4 +255,5 @@ ERROR: node is still EOpNull!
 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)

--- a/Test/baseResults/400.frag.out
+++ b/Test/baseResults/400.frag.out
@@ -1,10 +1,15 @@
 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: 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: 0:28: 'location qualifier on input' : not supported for this version or the enabled extensions 
+ERROR: 0:36: 'location qualifier on uniform or buffer' : not supported for this version or the enabled extensions 
+ERROR: 0:38: 'redeclaration' : cannot apply layout qualifier to gl_Color
+ERROR: 0:39: 'redeclaration' : cannot change qualification of gl_ClipDistance
+ERROR: 0:41: 'gl_FragCoord' : cannot redeclare after use 
+ERROR: 7 compilation errors.  No code generated.

+gl_FragCoord pixel center is integer
+gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:10  Function Definition: main( (void)
 0:10    Function Parameters: 
@@ -105,6 +110,10 @@ ERROR: node is still EOpNull!
 0:23            0.100000
 0:23          Construct ivec2 (2-component vector of int)
 0:23            'i' (flat in int)
+0:25      Sequence
+0:25        move second child to first child (4-component vector of float)
+0:25          'c' (4-component vector of float)
+0:25          'gl_FragCoord' (gl_FragCoord 4-component vector of float)
 0:?   Linker Objects
 0:?     'c2D' (smooth in 2-component vector of float)
 0:?     'i' (flat in int)
@@ -112,8 +121,12 @@ ERROR: node is still EOpNull!
 0:?     'arrayedSampler' (uniform 5-element array of sampler2D)
 0:?     'samp2dr' (uniform usampler2DRect)
 0:?     'isamp2DA' (uniform isampler2DArray)
-0:?     'gl_ClipDistance' (smooth in unsized array of float)
+0:?     'gl_ClipDistance' (smooth in 4-element array of float)
 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)
+0:?     '__anon__0' (in block{gl_FogFragCoord,gl_TexCoord,gl_Color,gl_SecondaryColor})
+0:?     '__anon__0' (in block{gl_FogFragCoord,gl_TexCoord,gl_Color,gl_SecondaryColor})
+0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)
+0:?     'gl_FragCoord' (gl_FragCoord 4-component vector of float)

--- a/Test/baseResults/410.geom.out
+++ b/Test/baseResults/410.geom.out
@@ -32,7 +32,7 @@ ERROR: node is still EOpNull!
 0:30            Constant:
 0:30              0 (const int)
 0:31      move second child to first child (float)
-0:31        gl_PointSize: direct index for structure (layout(stream=0 ) float)
+0:31        gl_PointSize: direct index for structure (layout(stream=0 ) gl_PointSize float)
 0:31          '__anon__0' (layout(stream=0 ) out block{gl_PointSize})
 0:31          Constant:
 0:31            0 (const uint)
--- a/Test/baseResults/specExamples.frag.out
+++ b/Test/baseResults/specExamples.frag.out
@@ -6,10 +6,8 @@ ERROR: 0:37: 'view' : redefinition
 ERROR: 0:68: 'lightPosition' : redefinition 
 ERROR: 0:75: 'Atten' : member storage qualifier cannot contradict block storage qualifier 
 ERROR: 0:87: 'Color' : redefinition 
-ERROR: 0:92: 'origin_upper_left' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4) 
-ERROR: 0:93: 'pixel_center_integer' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4) 
-ERROR: 0:94: 'origin_upper_left' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4) 
-ERROR: 0:94: 'pixel_center_integer' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4) 
+ERROR: 0:92: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord
+ERROR: 0:93: 'redeclaration' : cannot redeclare with different qualification: gl_FragCoord
 ERROR: 0:96: 'early_fragment_tests' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4) 
 ERROR: 0:99: 'local_size_x' : there is no such layout identifier for this stage taking an assigned value 
 ERROR: 0:99: 'local_size_y' : there is no such layout identifier for this stage taking an assigned value 
@@ -48,8 +46,10 @@ 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: 49 compilation errors.  No code generated.
+ERROR: 47 compilation errors.  No code generated.

+gl_FragCoord pixel center is integer
+gl_FragCoord origin is upper left
 ERROR: node is still EOpNull!
 0:5  Sequence
 0:5    move second child to first child (int)
--- a/Test/baseResults/specExamples.vert.out
+++ b/Test/baseResults/specExamples.vert.out
@@ -30,6 +30,8 @@ ERROR: 0:95: 'binding' : requires block, or sampler/image, or atomic-counter typ
 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:106: 'redeclaration' : cannot change storage, memory, or auxiliary qualification of gl_FrontColor
+ERROR: 0:107: 'redeclaration' : cannot change storage, memory, or auxiliary qualification of gl_FrontColor
 ERROR: 0:112: 'ColorIvn' : identifier not previously declared 
 ERROR: 0:132: 'shared' : not supported in this stage: vertex
 ERROR: 0:134: '' : function does not return a value: funcA
@@ -40,7 +42,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: 40 compilation errors.  No code generated.
+ERROR: 42 compilation errors.  No code generated.

 ERROR: node is still EOpNull!
 0:134  Function Definition: funcA(I21; (4-component vector of float)
--- a/Test/testlist
+++ b/Test/testlist
@@ -14,6 +14,7 @@ versionsErrors.vert
 140.frag
 150.vert
 150.geom
+150.frag
 precision.frag
 precision.vert
 nonSquare.vert