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

Restore r26245 and all tests and test results since 4/1:

Browse Source 
r26245: Remove "not yet complete" warning for versions 130 and 140, after tidying up a bit and adding tests.  Token pasting is the only known missing feature, and gives its own message now on use.


git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@26226 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-04-14 15:46:40 +00:00
parent dd09c05e5b
commit cf0206c341
125 changed files with 14154 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
specExamples.vert
Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:23: 'transforms' : redeclaration of array with size
ERROR: 0:29: 'location' : can only appy to uniform, buffer, in, or out storage qualifiers
ERROR: 0:31: 'triangles' : unrecognized layout identifier, or qualifier requires assignemnt (e.g., binding = 4)
@@ -282,26 +282,26 @@ ERROR: node is still EOpNull!
0:194 0.000000
0:? Linker Objects
0:? 'Coords' (out block{out 4-component vector of float Position, out 2-component vector of float Texture})
0:? '__anon__0' (out block{out 4-component vector of float Color})
0:? 'anon@0' (out block{out 4-component vector of float Color})
0:? 'transforms' (layout(column_major shared ) uniform 4-element array of block{layout(column_major shared ) uniform 4X4 matrix of float ModelViewMatrix, layout(column_major shared ) uniform 4X4 matrix of float ModelViewProjectionMatrix, layout(column_major shared ) uniform implicitly-sized array of 4-component vector of float a, layout(column_major shared ) uniform float Deformation})
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{3-component vector of float a1, 2X2 matrix of float b, 2-element array of 4-component vector of float c})
0:? 'var1' (smooth out 4-component vector of float)
0:? '__anon__1' (out block{out 4-component vector of float var2, out 2-component vector of float var3, out 3-component vector of float var4})
0:? 'anon@1' (out block{out 4-component vector of float var2, out 2-component vector of float var3, out 3-component vector of float var4})
0:? 'var5' (smooth out 4-component vector of float)
0:? '__anon__2' (out block{out 4-component vector of float var6})
0:? 'anon@2' (out block{out 4-component vector of float var6})
0:? 'var7' (smooth out 4-component vector of float)
0:? '__anon__3' (layout(row_major std140 ) uniform block{layout(row_major std140 offset=0 ) uniform 4X4 matrix of float M1, layout(column_major std140 offset=64 ) uniform 4X4 matrix of float M2, layout(row_major std140 offset=128 ) uniform 3X3 matrix of float N1})
0:? '__anon__4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform 4X4 matrix of float M13, layout(row_major shared ) uniform 4X4 matrix of float m14, layout(column_major shared ) uniform 3X3 matrix of float N12})
0:? 'anon@3' (layout(row_major std140 ) uniform block{layout(row_major std140 offset=0 ) uniform 4X4 matrix of float M1, layout(column_major std140 offset=64 ) uniform 4X4 matrix of float M2, layout(row_major std140 offset=128 ) uniform 3X3 matrix of float N1})
0:? 'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform 4X4 matrix of float M13, layout(row_major shared ) uniform 4X4 matrix of float m14, layout(column_major shared ) uniform 3X3 matrix of float N12})
0:? 's17' (layout(binding=3 ) uniform sampler2D)
0:? 'a2' (layout(binding=2 offset=4 ) uniform int)
0:? 'bar' (layout(binding=2 ) uniform int)
0:? 'b2' (layout(binding=2 ) uniform int)
0:? 'c2' (layout(binding=3 ) uniform int)
0:? 'd2' (layout(binding=2 ) uniform int)
0:? '__anon__5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out implicitly-sized array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out implicitly-sized array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? '__anon__5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out implicitly-sized array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out implicitly-sized array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? 'anon@5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out implicitly-sized array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out implicitly-sized array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? 'anon@5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out implicitly-sized array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out implicitly-sized array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? 'ColorInv' (smooth out 3-component vector of float)
0:? 'Color4' (invariant centroid smooth out 3-component vector of float)
0:? 'position' (smooth out 4-component vector of float)
@@ -311,8 +311,8 @@ ERROR: node is still EOpNull!
0:? 'c' (in 4-component vector of float)
0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float)
0:? '__anon__6' (layout(row_major shared ) coherent uniform block{layout(row_major shared ) readonly uniform 4-component vector of float member1, layout(row_major shared ) uniform 4-component vector of float member2})
0:? '__anon__7' (layout(row_major shared ) uniform block{layout(row_major shared ) coherent readonly uniform 4-component vector of float member1A, layout(row_major shared ) coherent uniform 4-component vector of float member2A})
0:? 'anon@6' (layout(row_major shared ) coherent uniform block{layout(row_major shared ) readonly uniform 4-component vector of float member1, layout(row_major shared ) uniform 4-component vector of float member2})
0:? 'anon@7' (layout(row_major shared ) uniform block{layout(row_major shared ) coherent readonly uniform 4-component vector of float member1A, layout(row_major shared ) coherent uniform 4-component vector of float member2A})
0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D)
0:? 'img2' (coherent uniform image2D)
@@ -325,4 +325,273 @@ Linked vertex stage:
Shader version: 430
Requested GL_3DL_array_objects
ERROR: node is still EOpNull!
0:134 Function Definition: funcA(I21; (4-component vector of float)
0:134 Function Parameters:
0:134 'a' (in image2D)
0:136 Function Definition: funcB(I21; (4-component vector of float)
0:136 Function Parameters:
0:136 'a' (in image2D)
0:140 Function Definition: func(f1;f1;f1;f1; (float)
0:140 Function Parameters:
0:140 'e' (in float)
0:140 'f' (in float)
0:140 'g' (in float)
0:140 'h' (in float)
0:142 Sequence
0:142 Branch: Return with expression
0:142 add (float)
0:142 component-wise multiply (float)
0:142 'e' (in float)
0:142 'f' (in float)
0:142 component-wise multiply (float)
0:142 'g' (in float)
0:142 'h' (in float)
0:146 Function Definition: func2(f1;f1;f1;f1; (float)
0:146 Function Parameters:
0:146 'e' (in float)
0:146 'f' (in float)
0:146 'g' (in float)
0:146 'h' (in float)
0:148 Sequence
0:148 Sequence
0:148 move second child to first child (float)
0:148 'result' (float)
0:148 add (float)
0:148 component-wise multiply (float)
0:148 'e' (in float)
0:148 'f' (in float)
0:148 component-wise multiply (float)
0:148 'g' (in float)
0:148 'h' (in float)
0:150 Branch: Return with expression
0:150 'result' (float)
0:153 Function Definition: func3(f1;f1;f1; (float)
0:153 Function Parameters:
0:153 'i' (in float)
0:153 'j' (in float)
0:153 'k' (out float)
0:155 Sequence
0:155 move second child to first child (float)
0:155 'k' (out float)
0:155 add (float)
0:155 component-wise multiply (float)
0:155 'i' (in float)
0:155 'i' (in float)
0:155 'j' (in float)
0:158 Function Definition: main( (void)
0:158 Function Parameters:
0:160 Sequence
0:160 Sequence
0:160 move second child to first child (3-component vector of float)
0:160 'r' (3-component vector of float)
0:160 Construct vec3 (3-component vector of float)
0:160 component-wise multiply (4-component vector of float)
0:160 'a' (in 4-component vector of float)
0:160 'b' (in 4-component vector of float)
0:161 Sequence
0:161 move second child to first child (3-component vector of float)
0:161 's' (3-component vector of float)
0:161 Construct vec3 (3-component vector of float)
0:161 component-wise multiply (4-component vector of float)
0:161 'c' (in 4-component vector of float)
0:161 'd' (in 4-component vector of float)
0:162 move second child to first child (3-component vector of float)
0:162 vector swizzle (3-component vector of float)
0:162 'v' (smooth out 4-component vector of float)
0:162 Sequence
0:162 Constant:
0:162 0 (const int)
0:162 Constant:
0:162 1 (const int)
0:162 Constant:
0:162 2 (const int)
0:162 add (3-component vector of float)
0:162 'r' (3-component vector of float)
0:162 's' (3-component vector of float)
0:163 move second child to first child (float)
0:163 direct index (float)
0:163 'v' (smooth out 4-component vector of float)
0:163 Constant:
0:163 3 (const int)
0:163 add (float)
0:163 component-wise multiply (float)
0:163 direct index (float)
0:163 'a' (in 4-component vector of float)
0:163 Constant:
0:163 3 (const int)
0:163 direct index (float)
0:163 'b' (in 4-component vector of float)
0:163 Constant:
0:163 3 (const int)
0:163 component-wise multiply (float)
0:163 direct index (float)
0:163 'c' (in 4-component vector of float)
0:163 Constant:
0:163 3 (const int)
0:163 direct index (float)
0:163 'd' (in 4-component vector of float)
0:163 Constant:
0:163 3 (const int)
0:164 move second child to first child (float)
0:164 direct index (float)
0:164 'v' (smooth out 4-component vector of float)
0:164 Constant:
0:164 0 (const int)
0:164 Function Call: func(f1;f1;f1;f1; (float)
0:164 direct index (float)
0:164 'a' (in 4-component vector of float)
0:164 Constant:
0:164 0 (const int)
0:164 direct index (float)
0:164 'b' (in 4-component vector of float)
0:164 Constant:
0:164 0 (const int)
0:164 direct index (float)
0:164 'c' (in 4-component vector of float)
0:164 Constant:
0:164 0 (const int)
0:164 direct index (float)
0:164 'd' (in 4-component vector of float)
0:164 Constant:
0:164 0 (const int)
0:166 move second child to first child (float)
0:166 direct index (float)
0:166 'v' (smooth out 4-component vector of float)
0:166 Constant:
0:166 0 (const int)
0:166 Function Call: func2(f1;f1;f1;f1; (float)
0:166 direct index (float)
0:166 'a' (in 4-component vector of float)
0:166 Constant:
0:166 0 (const int)
0:166 direct index (float)
0:166 'b' (in 4-component vector of float)
0:166 Constant:
0:166 0 (const int)
0:166 direct index (float)
0:166 'c' (in 4-component vector of float)
0:166 Constant:
0:166 0 (const int)
0:166 direct index (float)
0:166 'd' (in 4-component vector of float)
0:166 Constant:
0:166 0 (const int)
0:167 Function Call: func3(f1;f1;f1; (float)
0:167 component-wise multiply (float)
0:167 direct index (float)
0:167 'a' (in 4-component vector of float)
0:167 Constant:
0:167 0 (const int)
0:167 direct index (float)
0:167 'b' (in 4-component vector of float)
0:167 Constant:
0:167 0 (const int)
0:167 component-wise multiply (float)
0:167 direct index (float)
0:167 'c' (in 4-component vector of float)
0:167 Constant:
0:167 0 (const int)
0:167 direct index (float)
0:167 'd' (in 4-component vector of float)
0:167 Constant:
0:167 0 (const int)
0:167 direct index (float)
0:167 'v' (smooth out 4-component vector of float)
0:167 Constant:
0:167 0 (const int)
0:169 Function Call: funcA(I21; (4-component vector of float)
0:169 'img1' (uniform image2D)
0:170 Function Call: funcB(I21; (4-component vector of float)
0:170 'img2' (coherent uniform image2D)
0:? Sequence
0:178 Sequence
0:178 move second child to first child (structure{float intensity, 3-component vector of float position})
0:178 'lightVar' (structure{float intensity, 3-component vector of float position})
0:178 Constant:
0:178 3.000000
0:178 1.000000
0:178 2.000000
0:178 3.000000
0:? Sequence
0:185 Sequence
0:185 move second child to first child (5-element array of float)
0:185 'a' (5-element array of float)
0:185 Construct float (5-element array of float)
0:185 'g' (float)
0:185 Constant:
0:185 1.000000
0:185 'g' (float)
0:185 Constant:
0:185 2.300000
0:185 'g' (float)
0:188 move second child to first child (3-element array of float)
0:188 'b' (3-element array of float)
0:188 Construct float (3-element array of float)
0:188 'g' (float)
0:188 add (float)
0:188 'g' (float)
0:188 Constant:
0:188 1.000000
0:188 add (float)
0:188 'g' (float)
0:188 Constant:
0:188 2.000000
0:191 Sequence
0:191 Sequence
0:191 move second child to first child (2-element array of 4-component vector of float)
0:191 'b' (2-element array of 4-component vector of float)
0:191 Constant:
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:191 1.000000
0:192 Constant:
0:192 0.000000
0:193 Constant:
0:193 0.000000
0:194 Constant:
0:194 0.000000
0:? Linker Objects
0:? 'Coords' (out block{out 4-component vector of float Position, out 2-component vector of float Texture})
0:? 'anon@0' (out block{out 4-component vector of float Color})
0:? 'transforms' (layout(column_major shared ) uniform 4-element array of block{layout(column_major shared ) uniform 4X4 matrix of float ModelViewMatrix, layout(column_major shared ) uniform 4X4 matrix of float ModelViewProjectionMatrix, layout(column_major shared ) uniform 1-element array of 4-component vector of float a, layout(column_major shared ) uniform float Deformation})
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{3-component vector of float a1, 2X2 matrix of float b, 2-element array of 4-component vector of float c})
0:? 'var1' (smooth out 4-component vector of float)
0:? 'anon@1' (out block{out 4-component vector of float var2, out 2-component vector of float var3, out 3-component vector of float var4})
0:? 'var5' (smooth out 4-component vector of float)
0:? 'anon@2' (out block{out 4-component vector of float var6})
0:? 'var7' (smooth out 4-component vector of float)
0:? 'anon@3' (layout(row_major std140 ) uniform block{layout(row_major std140 offset=0 ) uniform 4X4 matrix of float M1, layout(column_major std140 offset=64 ) uniform 4X4 matrix of float M2, layout(row_major std140 offset=128 ) uniform 3X3 matrix of float N1})
0:? 'anon@4' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform 4X4 matrix of float M13, layout(row_major shared ) uniform 4X4 matrix of float m14, layout(column_major shared ) uniform 3X3 matrix of float N12})
0:? 's17' (layout(binding=3 ) uniform sampler2D)
0:? 'a2' (layout(binding=2 offset=4 ) uniform int)
0:? 'bar' (layout(binding=2 ) uniform int)
0:? 'b2' (layout(binding=2 ) uniform int)
0:? 'c2' (layout(binding=3 ) uniform int)
0:? 'd2' (layout(binding=2 ) uniform int)
0:? 'anon@5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out 1-element array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out 1-element array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? 'anon@5' (out block{invariant gl_Position 4-component vector of float gl_Position, gl_PointSize float gl_PointSize, out 1-element array of float gl_ClipDistance, gl_ClipVertex 4-component vector of float gl_ClipVertex, flat out 4-component vector of float gl_FrontColor, out 4-component vector of float gl_BackColor, out 4-component vector of float gl_FrontSecondaryColor, out 4-component vector of float gl_BackSecondaryColor, out 1-element array of 4-component vector of float gl_TexCoord, out float gl_FogFragCoord})
0:? 'ColorInv' (smooth out 3-component vector of float)
0:? 'Color4' (invariant centroid smooth out 3-component vector of float)
0:? 'position' (smooth out 4-component vector of float)
0:? 'Color5' (smooth out 3-component vector of float)
0:? 'a' (in 4-component vector of float)
0:? 'b' (in 4-component vector of float)
0:? 'c' (in 4-component vector of float)
0:? 'd' (in 4-component vector of float)
0:? 'v' (smooth out 4-component vector of float)
0:? 'anon@6' (layout(row_major shared ) coherent uniform block{layout(row_major shared ) readonly uniform 4-component vector of float member1, layout(row_major shared ) uniform 4-component vector of float member2})
0:? 'anon@7' (layout(row_major shared ) uniform block{layout(row_major shared ) coherent readonly uniform 4-component vector of float member1A, layout(row_major shared ) coherent uniform 4-component vector of float member2A})
0:? 'shv' (shared 4-component vector of float)
0:? 'img1' (uniform image2D)
0:? 'img2' (coherent uniform image2D)
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)