mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unify the 8 grammar productions for declaring variables. This greatly simplifies making changes for this set of productions.

Browse Source 
This change also naturally picks up redeclarations of built-in arrays and the addition of the remaining linker objects of const, arrays, etc.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23246 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-09-26 00:45:21 +00:00
parent 337dbc7d8c
commit 9839e2440e
45 changed files with 505 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/120.frag.out
View File

@@ -292,4 +292,6 @@ ERROR: node is still EOpNull!
0:? 'm' (uniform 4X2 matrix of float)
0:? 'imageBuffer' (float)
0:? 'uimage2DRect' (float)
0:? 'a' (int)
0:? 'gl_TexCoord' (smooth in 6-element array of 4-component vector of float)

9
Test/baseResults/120.vert.out
View File

@@ -23,12 +23,11 @@ ERROR: 0:37: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:38: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:38: 'constructor' : array constructor needs one argument per array element
ERROR: 0:38: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:43: 'uniform' : cannot initialize this type of qualifier
ERROR: 0:47: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:48: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:49: 'arrays of arrays' : not supported with this profile: none
ERROR: 0:50: 'arrays of arrays' : not supported with this profile: none
ERROR: 30 compilation errors. No code generated.
ERROR: 29 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:15 Function Definition: main( (void)
@@ -71,6 +70,10 @@ ERROR: node is still EOpNull!
0:40 move second child to first child (float)
0:40 'gl_PointSize' (invariant gl_PointSize float)
0:40 3.800000
0:43 Sequence
0:43 move second child to first child (float)
0:43 'initted' (uniform float)
0:43 3.400000
0:? Linker Objects
0:? 'i' (in 4-component vector of float)
0:? 'o' (smooth out 4-component vector of float)
@@ -78,4 +81,6 @@ ERROR: node is still EOpNull!
0:? 'attv4' (in 4-component vector of float)
0:? 's2D' (uniform sampler2D)
0:? 'centTexCoord' (invariant smooth out 2-component vector of float)
0:? 'initted' (uniform float)
0:? 'concall' (const float)

3
Test/baseResults/130.frag.out
View File

@@ -2,6 +2,9 @@
0:16 Function Definition: main( (void)
0:16 Function Parameters:
0:? Linker Objects
0:? 'a' (3-component vector of float)
0:? 'b' (float)
0:? 'c' (int)
0:? 'i' (smooth in 4-component vector of float)
0:? 'o' (out 4-component vector of float)
0:? 'fflat' (flat in float)

2
Test/baseResults/300.frag.out
View File

@@ -217,6 +217,7 @@ ERROR: node is still EOpNull!
0:? 'c1D' (smooth in lowp float)
0:? 'c2D' (smooth in lowp 2-component vector of float)
0:? 'c3D' (smooth in lowp 3-component vector of float)
0:? 'c4D' (smooth lowp 4-component vector of float)
0:? 'ic1D' (flat in mediump int)
0:? 'ic2D' (flat in mediump 2-component vector of int)
0:? 'ic3D' (flat in mediump 3-component vector of int)
@@ -227,5 +228,6 @@ ERROR: node is still EOpNull!
0:? 's2' (smooth in structure)
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(shared ) uniform 2-element array of block)

3
Test/baseResults/300.vert.out
View File

@@ -126,6 +126,7 @@ ERROR: node is still EOpNull!
0:? 'm44' (uniform highp 4X4 matrix of float)
0:? 'v3' (in highp 3-component vector of float)
0:? 'v2' (smooth out highp 2-component vector of float)
0:? 'bad' (in 10-element array of highp 4-component vector of float)
0:? 'badorder' (in highp 4-component vector of float)
0:? 'badorder2' (invariant smooth out highp 4-component vector of float)
0:? 'badorder4' (centroid in highp 4-component vector of float)
@@ -134,8 +135,10 @@ ERROR: node is still EOpNull!
0:? 'rep2' (centroid smooth sample out highp 4-component vector of float)
0:? 'rep3' (in highp 4-component vector of float)
0:? 's' (smooth out structure)
0:? 'badsize' (unsized array of highp float)
0:? 'badsize2' (unsized array of highp float)
0:? 'ubInst' (layout(shared ) uniform unsized array of block)
0:? 'okayA' (2-element array of highp float)
0:? 'gl_VertexID' (gl_VertexId highp int)
0:? 'gl_InstanceID' (gl_InstanceId highp int)

1
Test/baseResults/300layout.frag.out
View File

@@ -21,4 +21,5 @@ ERROR: node is still EOpNull!
0:? 'color' (layout(location=2 ) smooth in mediump 4-component vector of float)
0:? 'c' (layout(location=1 ) out mediump 4-component vector of float)
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)

3
Test/baseResults/300layout.vert.out
View File

@@ -49,12 +49,15 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'c' (layout(location=7 ) in highp 3-component vector of float)
0:? 'p' (layout(location=3 ) in highp 4-component vector of float)
0:? 'q' (layout(location=9 ) in 4-element array of highp 4-component vector of float)
0:? 'r' (layout(location=10 ) in 4-element array of structure)
0:? 'pos' (smooth out highp 4-component vector of float)
0:? 'color' (smooth out highp 3-component vector of float)
0:? 'badm4' (layout(column_major shared ) uniform highp 4X4 matrix of float)
0:? 'tblock' (layout(std140 ) uniform block)
0:? '__anon__0' (layout(shared ) uniform block)
0:? 'badout' (layout(location=10 ) smooth out highp 4-component vector of float)
0:? 'compute_only' (shared highp 4-component vector of float)
0:? 'gl_VertexID' (gl_VertexId highp int)
0:? 'gl_InstanceID' (gl_InstanceId highp int)

1
Test/baseResults/300operations.frag.out
View File

@@ -200,4 +200,5 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'instanceName' (layout(shared ) uniform block)
0:? 's' (structure)
0:? 'a' (5-element array of mediump float)

1
Test/baseResults/400.frag.out
View File

@@ -15,4 +15,5 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'c2D' (smooth in 2-component vector of float)
0:? 'i' (flat in int)
0:? 'arrayedSampler' (uniform 5-element array of sampler2D)

1
Test/baseResults/420.vert.out
View File

@@ -37,6 +37,7 @@ ERROR: node is still EOpNull!
0:30 'v' (in 4-component vector of float)
0:? Linker Objects
0:? 'v2' (smooth out 2-component vector of float)
0:? 'bad' (in 10-element array of 4-component vector of float)
0:? 'badorder' (in 4-component vector of float)
0:? 'badorder2' (invariant smooth out 4-component vector of float)
0:? 'badorder4' (centroid in 4-component vector of float)

3
Test/baseResults/array.frag.out
View File

@@ -147,5 +147,8 @@ ERROR: node is still EOpNull!
0:58 1 (const int)
0:58 4 (const int)
0:? Linker Objects
0:? 'gu' (unsized array of float)
0:? 'g4' (4-element array of float)
0:? 'g5' (5-element array of float)
0:? 'a' (uniform int)

3
Test/baseResults/array100.frag.out
View File

@@ -99,5 +99,8 @@ ERROR: node is still EOpNull!
0:40 1.000000
0:40 1.000000
0:? Linker Objects
0:? 'gu' (unsized array of mediump float)
0:? 'g4' (4-element array of mediump float)
0:? 'g5' (5-element array of mediump float)
0:? 'a' (uniform mediump int)

3
Test/baseResults/constErrors.frag.out
View File

@@ -15,5 +15,8 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'inVar' (smooth in 4-component vector of float)
0:? 'outVar' (out 4-component vector of float)
0:? 'constInt' (const int)
0:? 'uniformInt' (uniform int)
0:? 's' (structure)
0:? 's2' (structure)

9
Test/baseResults/constFold.frag.out
View File

@@ -138,6 +138,14 @@
0:81 0 (const int)
0:81 7.000000
0:? Linker Objects
0:? 'a' (const int)
0:? 'b' (const int)
0:? 'c' (const int)
0:? 'd' (const int)
0:? 'e' (const float)
0:? 'f' (const float)
0:? 'g' (const float)
0:? 'pytho' (const 2-component vector of float)
0:? 'inv' (smooth in 4-component vector of float)
0:? 'FragColor' (out 4-component vector of float)
0:? 'out2' (out 2-component vector of float)
@@ -152,4 +160,5 @@
0:? 'out11' (out 4-component vector of float)
0:? 'out12' (out 2-component vector of int)
0:? 'out13' (out 3-component vector of uint)
0:? 's' (const structure)

1
Test/baseResults/cppComplexExpr.vert.out
View File

@@ -21,4 +21,5 @@ WARNING: #version: statement missing; use #version on first line of shader
0:39 Construct vec4 (highp 4-component vector of float)
0:39 'sum' (highp float)
0:? Linker Objects
0:? 'sum' (highp float)

1
Test/baseResults/cppIndent.vert.out
View File

@@ -26,4 +26,5 @@
0:56 Construct vec4 (4-component vector of float)
0:56 'sum' (float)
0:? Linker Objects
0:? 'sum' (float)

1
Test/baseResults/cppNest.vert.out
View File

@@ -29,4 +29,5 @@
0:86 Construct vec4 (4-component vector of float)
0:86 'sum' (float)
0:? Linker Objects
0:? 'sum' (float)

5
Test/baseResults/cppSimple.vert.out
View File

@@ -71,5 +71,10 @@ ERROR: node is still EOpNull!
0:130 'twoPi' (float)
0:130 6.280000
0:? Linker Objects
0:? 'sum' (float)
0:? 'linenumber' (int)
0:? 'filenumber' (int)
0:? 'version' (int)
0:? 'twoPi' (float)
0:? 'tod' (float)

2
Test/baseResults/dce.frag.out
View File

@@ -114,4 +114,6 @@
0:55 Pre-Increment (int)
0:55 'c' (int)
0:? Linker Objects
0:? 'flag' (const bool)
0:? 'c' (int)

151
Test/baseResults/decls.frag.out Normal file
View File

@@ -0,0 +1,151 @@
ERROR: 0:19: 'vi4' : illegal use of type 'void'
ERROR: 0:20: 'vj' : illegal use of type 'void'
ERROR: 0:20: 'vk5' : illegal use of type 'void'
ERROR: 0:21: 'vm2' : illegal use of type 'void'
ERROR: 0:21: 'vm3' : illegal use of type 'void'
ERROR: 0:22: 'vn8' : illegal use of type 'void'
ERROR: 0:22: 'vp' : illegal use of type 'void'
ERROR: 0:24: 'gl_' : reserved built-in name
ERROR: 0:25: 'gl_' : reserved built-in name
ERROR: 0:25: 'gl_' : reserved built-in name
ERROR: 0:26: 'gl_' : reserved built-in name
ERROR: 0:26: 'gl_' : reserved built-in name
ERROR: 0:27: 'gl_' : reserved built-in name
ERROR: 0:27: 'gl_' : reserved built-in name
ERROR: 0:32: '' : boolean expression expected
ERROR: 0:33: 'gl_' : reserved built-in name
ERROR: 16 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:5 Sequence
0:5 move second child to first child (int)
0:5 'd1' (int)
0:5 1 (const int)
0:6 Sequence
0:6 move second child to first child (int)
0:6 'e2' (int)
0:6 2 (const int)
0:7 Sequence
0:7 move second child to first child (int)
0:7 'h3' (int)
0:7 3 (const int)
0:14 Sequence
0:14 move second child to first child (4-element array of int)
0:14 'ii4' (4-element array of int)
0:14 1 (const int)
0:14 2 (const int)
0:14 3 (const int)
0:14 4 (const int)
0:15 Sequence
0:15 move second child to first child (5-element array of int)
0:15 'ik5' (5-element array of int)
0:15 5 (const int)
0:15 6 (const int)
0:15 7 (const int)
0:15 8 (const int)
0:15 9 (const int)
0:16 Sequence
0:16 move second child to first child (2-element array of int)
0:16 'im2' (2-element array of int)
0:16 10 (const int)
0:16 11 (const int)
0:16 move second child to first child (3-element array of int)
0:16 'im3' (3-element array of int)
0:16 12 (const int)
0:16 13 (const int)
0:16 14 (const int)
0:17 Sequence
0:17 move second child to first child (4-element array of int)
0:17 'in8' (4-element array of int)
0:17 21 (const int)
0:17 22 (const int)
0:17 23 (const int)
0:17 24 (const int)
0:24 Sequence
0:24 move second child to first child (4-element array of int)
0:24 'gl_vi4' (4-element array of int)
0:24 1 (const int)
0:24 2 (const int)
0:24 3 (const int)
0:24 4 (const int)
0:25 Sequence
0:25 move second child to first child (5-element array of int)
0:25 'gl_vk5' (5-element array of int)
0:25 5 (const int)
0:25 6 (const int)
0:25 7 (const int)
0:25 8 (const int)
0:25 9 (const int)
0:26 Sequence
0:26 move second child to first child (2-element array of int)
0:26 'gl_vm2' (2-element array of int)
0:26 10 (const int)
0:26 11 (const int)
0:26 move second child to first child (3-element array of int)
0:26 'gl_vm3' (3-element array of int)
0:26 12 (const int)
0:26 13 (const int)
0:26 14 (const int)
0:27 Sequence
0:27 move second child to first child (4-element array of int)
0:27 'gl_vn8' (4-element array of int)
0:27 21 (const int)
0:27 22 (const int)
0:27 23 (const int)
0:27 24 (const int)
0:29 Function Definition: main( (void)
0:29 Function Parameters:
0:31 Sequence
0:31 Loop with condition tested first
0:31 Loop Condition
0:31 move second child to first child (bool)
0:31 'cond' (bool)
0:31 Compare Less Than (bool)
0:31 'b' (int)
0:31 'c' (int)
0:31 No loop body
0:32 Loop with condition tested first
0:32 Loop Condition
0:32 move second child to first child (int)
0:32 'icond' (int)
0:32 'b' (int)
0:32 No loop body
0:33 Loop with condition tested first
0:33 Loop Condition
0:33 move second child to first child (bool)
0:33 'gl_cond' (bool)
0:33 Compare Less Than (bool)
0:33 'b' (int)
0:33 'c' (int)
0:33 No loop body
0:? Linker Objects
0:? 'a' (int)
0:? 'b' (int)
0:? 'c' (int)
0:? 'd1' (int)
0:? 'e2' (int)
0:? 'f' (int)
0:? 'g' (int)
0:? 'h3' (int)
0:? 'i4' (4-element array of int)
0:? 'j' (int)
0:? 'k5' (5-element array of int)
0:? 'm6' (6-element array of int)
0:? 'm7' (7-element array of int)
0:? 'n8' (8-element array of int)
0:? 'p' (int)
0:? 'ii4' (4-element array of int)
0:? 'ij' (int)
0:? 'ik5' (5-element array of int)
0:? 'im2' (2-element array of int)
0:? 'im3' (3-element array of int)
0:? 'in8' (4-element array of int)
0:? 'ip' (int)
0:? 'gl_vi4' (4-element array of int)
0:? 'gl_vj' (int)
0:? 'gl_vk5' (5-element array of int)
0:? 'gl_vm2' (2-element array of int)
0:? 'gl_vm3' (3-element array of int)
0:? 'gl_vn8' (4-element array of int)
0:? 'gl_vp' (int)

4
Test/baseResults/deepRvalue.frag.out
View File

@@ -115,4 +115,8 @@
0:35 'i' (float)
0:? Linker Objects
0:? 'sampler' (uniform sampler2D)
0:? 'v1' (4-component vector of float)
0:? 'v2' (4-component vector of float)
0:? 'v3' (4-component vector of float)
0:? 'v4' (4-component vector of float)

1
Test/baseResults/functionCall.frag.out
View File

@@ -76,4 +76,5 @@ WARNING: 0:4: varying deprecated in version 130; may be removed in future releas
0:? 'bigColor' (uniform 4-component vector of float)
0:? 'BaseColor' (smooth in 4-component vector of float)
0:? 'd' (uniform float)
0:? 'h' (float)

2
Test/baseResults/length.frag.out
View File

@@ -19,4 +19,6 @@
0:17 30.000000
0:17 30.000000
0:? Linker Objects
0:? 'u' (uniform 3-element array of 4-component vector of float)
0:? 'v' (smooth in 2-element array of 2-component vector of float)

15
Test/baseResults/link1.frag.out
View File

@@ -33,8 +33,12 @@ link1.frag
0:? Linker Objects
0:? 'uv4' (uniform 4-component vector of float)
0:? 'glass' (uniform 3-component vector of float)
0:? 'ci' (const int)
0:? 'a' (4-component vector of float)
0:? 'iv3' (smooth in 3-component vector of float)
0:? 'cup' (smooth in 4-component vector of float)
0:? 'b' (4-component vector of float)
0:? 'c' (4-component vector of float)
link2.frag
@@ -66,8 +70,12 @@ link2.frag
0:? Linker Objects
0:? 'uv4' (uniform 4-component vector of float)
0:? 'glass' (uniform 2-component vector of float)
0:? 'ci' (const int)
0:? 'd' (4-component vector of float)
0:? 'iv3' (smooth in 3-component vector of float)
0:? 'cup' (flat in 4-component vector of float)
0:? 'e' (4-component vector of float)
0:? 'f' (4-component vector of float)
link3.frag
@@ -145,6 +153,13 @@ ERROR: Linking fragment stage: Precision qualifiers must match:
0:? Linker Objects
0:? 'uv4' (uniform 4-component vector of float)
0:? 'glass' (uniform 3-component vector of float)
0:? 'ci' (const int)
0:? 'a' (4-component vector of float)
0:? 'iv3' (smooth in 3-component vector of float)
0:? 'cup' (smooth in 4-component vector of float)
0:? 'b' (4-component vector of float)
0:? 'c' (4-component vector of float)
0:? 'd' (4-component vector of float)
0:? 'e' (4-component vector of float)
0:? 'f' (4-component vector of float)

1
Test/baseResults/matrixError.vert.out
View File

@@ -30,4 +30,5 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'v3' (in 3-component vector of float)
0:? 'm32' (uniform 3X2 matrix of float)
0:? 'm24' (2X4 matrix of float)

3
Test/baseResults/nonSquare.vert.out
View File

@@ -59,4 +59,7 @@
0:? 'v3' (in 3-component vector of float)
0:? 'v4' (in 4-component vector of float)
0:? 'm32' (uniform 3X2 matrix of float)
0:? 'cv2' (const 2-component vector of float)
0:? 'm24' (const 2X4 matrix of float)
0:? 'm42' (const 4X2 matrix of float)

1
Test/baseResults/precision.frag.out
View File

@@ -109,4 +109,5 @@ ERROR: node is still EOpNull!
0:? 'samplerHigh' (uniform highp sampler2D)
0:? 'uint' (mediump 4-component vector of float)
0:? 'global_high' (highp int)
0:? 'b2' (mediump 2-component vector of bool)

29
Test/baseResults/specExamples.frag.out
View File

@@ -3,7 +3,6 @@ ERROR: 0:20: '' : numeric literal too big
ERROR: 0:21: '' : hexidecimal literal too big
ERROR: 0:37: 'view' : redefinition
ERROR: 0:68: 'lightPosition' : redefinition
ERROR: 0:69: 'uniform' : cannot initialize this type of qualifier
ERROR: 0:71: 'Material' : only uniform interface blocks are supported
ERROR: 0:79: 'Light' : only uniform interface blocks are supported
ERROR: 0:83: 'ColoredTexture' : only uniform interface blocks are supported
@@ -54,7 +53,7 @@ ERROR: 0:226: 'in' : only allowed at global scope
ERROR: 0:227: 'in' : only allowed at global scope
ERROR: 0:228: 'in' : only allowed at global scope
ERROR: 0:232: 'out' : only allowed at global scope
ERROR: 56 compilation errors. No code generated.
ERROR: 55 compilation errors. No code generated.
ERROR: node is still EOpNull!
0:5 Sequence
@@ -109,6 +108,12 @@ ERROR: node is still EOpNull!
0:26 move second child to first child (double)
0:26 'fd' (double)
0:26 2.000000
0:69 Sequence
0:69 move second child to first child (3-component vector of float)
0:69 'color' (uniform 3-component vector of float)
0:69 0.700000
0:69 0.700000
0:69 0.200000
0:127 Function Definition: foo(f1[5]; (5-element array of float)
0:127 Function Parameters:
0:127 '' (in 5-element array of float)
@@ -196,8 +201,22 @@ ERROR: node is still EOpNull!
0:218 'c' (5-element array of float)
0:218 'a' (5-element array of float)
0:? Linker Objects
0:? 'a' (int)
0:? 'b' (int)
0:? 'c' (uint)
0:? 'd' (uint)
0:? 'e' (int)
0:? 'f' (uint)
0:? 'g' (int)
0:? 'h' (int)
0:? 'i' (int)
0:? 'j' (int)
0:? 'k' (int)
0:? 'l' (int)
0:? 'fa' (float)
0:? 'fb' (float)
0:? 'fc' (double)
0:? 'fd' (double)
0:? 'texcoord1' (2-component vector of float)
0:? 'texcoord2' (2-component vector of float)
0:? 'position' (3-component vector of float)
@@ -212,14 +231,20 @@ ERROR: node is still EOpNull!
0:? 'highPrecisionMVP' (4X4 matrix of double)
0:? 'dm' (2X4 matrix of double)
0:? 'lightVar' (structure)
0:? 'frequencies' (3-element array of float)
0:? 'lightPosition' (uniform 4-element array of 4-component vector of float)
0:? 'lights' (2-element array of structure)
0:? 'numLights' (const int)
0:? 'normal' (smooth in 3-component vector of float)
0:? 'TexCoord' (centroid smooth in 2-component vector of float)
0:? 'Color' (invariant centroid smooth in 4-component vector of float)
0:? 'temperature' (noperspective in float)
0:? 'myColor' (flat in 3-component vector of float)
0:? 'myTexCoord' (centroid noperspective in 2-component vector of float)
0:? 'color' (uniform 3-component vector of float)
0:? 'gl_FragCoord' (gl_FragCoord 4-component vector of float)
0:? 'factor' (layout(location=3 ) out 4-component vector of float)
0:? 'colors' (layout(location=2 ) out 3-element array of 4-component vector of float)
0:? 'gl_FragDepth' (gl_FragDepth float)
0:? 'gl_Color' (smooth in 4-component vector of float)

3
Test/baseResults/specExamples.vert.out
View File

@@ -222,6 +222,8 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'transforms' (layout(shared ) uniform 4-element array of block)
0:? 'normal' (layout(location=3 ) in 4-component vector of float)
0:? 'colors' (layout(location=6 ) in 3-element array of 4-component vector of float)
0:? 's' (layout(location=3 ) structure)
0:? 'var1' (smooth out 4-component vector of float)
0:? 'var5' (smooth out 4-component vector of float)
0:? 'var7' (smooth out 4-component vector of float)
@@ -244,6 +246,7 @@ ERROR: node is still EOpNull!
0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float)
0:? '__anon__2' (layout(shared ) uniform block)
0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D)
0:? 'img2' (coherent uniform image2D)
0:? 'gl_VertexID' (gl_VertexId int)

1
Test/baseResults/structure.frag.out
View File

@@ -59,4 +59,5 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
0:? 'foo' (uniform structure)
0:? 'foo2' (uniform 5-element array of structure)

12
Test/baseResults/tokenLength.vert.out
View File

@@ -77,7 +77,19 @@ ERROR: node is still EOpNull!
0:? Linker Objects
0:? 'BCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789' (in highp float)
0:? 'ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789' (in highp float)
0:? 'E1' (highp int)
0:? 'E2' (highp int)
0:? 'B' (highp int)
0:? 'OE' (highp int)
0:? 'HE' (highp int)
0:? 'F' (highp float)
0:? 'G' (highp float)
0:? 'E3' (highp float)
0:? 'BCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789B' (highp float)
0:? 'superH' (highp int)
0:? 'superO' (highp int)
0:? 'superI' (highp int)
0:? 'superF' (highp float)
0:? 'gl_VertexID' (gl_VertexId highp int)
0:? 'gl_InstanceID' (gl_InstanceId highp int)

2
Test/baseResults/uniformArray.frag.out
View File

@@ -33,4 +33,6 @@
0:? Linker Objects
0:? 'texSampler2D' (uniform sampler2D)
0:? 'inColor' (uniform 3-component vector of float)
0:? 'color' (uniform 6-element array of 4-component vector of float)
0:? 'alpha' (uniform 16-element array of float)

1
Test/baseResults/variableArrayIndex.frag.out
View File

@@ -86,6 +86,7 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
0:? 'foo' (uniform structure)
0:? 'foo2' (uniform 5-element array of structure)
0:? 'foo3' (uniform structure)
0:? 'Count' (uniform int)

2
Test/baseResults/varyingArray.frag.out
View File

@@ -46,4 +46,6 @@ WARNING: 0:8: varying deprecated in version 130; may be removed in future releas
0:? 'texSampler2D' (uniform sampler2D)
0:? 'color' (smooth in 4-component vector of float)
0:? 'alpha' (smooth in float)
0:? 'gl_TexCoord' (smooth in 6-element array of 4-component vector of float)
0:? 'foo' (smooth in 3-element array of 4-component vector of float)

2
Test/baseResults/varyingArrayIndirect.frag.out
View File

@@ -50,6 +50,8 @@ WARNING: 0:8: varying deprecated in version 130; may be removed in future releas
0:? 'texSampler2D' (uniform sampler2D)
0:? 'color' (smooth in 4-component vector of float)
0:? 'alpha' (smooth in float)
0:? 'gl_TexCoord' (smooth in 6-element array of 4-component vector of float)
0:? 'userIn' (smooth in 2-element array of 4-component vector of float)
0:? 'a' (uniform int)
0:? 'b' (uniform int)

1
Test/baseResults/voidFunction.frag.out
View File

@@ -36,4 +36,5 @@
0:? 'bigColor' (uniform 4-component vector of float)
0:? 'BaseColor' (smooth in 4-component vector of float)
0:? 'd' (uniform float)
0:? 'bar' (float)