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

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

View file

@ -1,5 +1,5 @@
430.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:3: 'location' : can only appy to uniform, buffer, in, or out storage qualifiers
ERROR: 0:7: 'location qualifier on in/out block' : not supported for this version or the enabled extensions
ERROR: 0:8: 'location qualifier on in/out block' : not supported for this version or the enabled extensions
@ -57,7 +57,7 @@ ERROR: node is still EOpNull!
0:16 move second child to first child (float)
0:16 direct index (float)
0:16 gl_ClipDistance: direct index for structure (out 17-element array of float)
0:16 '__anon__0' (out block{out 17-element array of float gl_ClipDistance, })
0:16 'anon@0' (out block{out 17-element array of float gl_ClipDistance, })
0:16 Constant:
0:16 2 (const uint)
0:16 Constant:
@ -75,7 +75,7 @@ ERROR: node is still EOpNull!
0:? 'uv4' (layout(location=4 ) uniform 4-component vector of float)
0:? 'b1' (layout(location=2 ) in block{in 4-component vector of float v})
0:? 'b2' (layout(location=2 ) out block{out 4-component vector of float v})
0:? '__anon__0' (out block{out 17-element array of float gl_ClipDistance, })
0:? 'anon@0' (out block{out 17-element array of float gl_ClipDistance, })
0:? 'cs' (layout(location=10 ) smooth out 2-element array of structure{7-element array of 3X2 matrix of float m, float f})
0:? 'cf' (layout(location=54 ) smooth out float)
0:? 'cg' (layout(location=53 ) smooth out float)
@ -122,4 +122,65 @@ ERROR: xfb_buffer 3, xfb_stride 64, minimum stride needed: 80
Shader version: 430
Requested GL_ARB_enhanced_layouts
in xfb mode
ERROR: node is still EOpNull!
0:14 Function Definition: foo( (void)
0:14 Function Parameters:
0:16 Sequence
0:16 move second child to first child (float)
0:16 direct index (float)
0:16 gl_ClipDistance: direct index for structure (out 17-element array of float)
0:16 'anon@0' (out block{out 17-element array of float gl_ClipDistance, })
0:16 Constant:
0:16 2 (const uint)
0:16 Constant:
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=4 ) uniform 4-component vector of float)
0:? 'b1' (layout(location=2 ) in block{in 4-component vector of float v})
0:? 'b2' (layout(location=2 ) out block{out 4-component vector of float v})
0:? 'anon@0' (out block{out 17-element array of float gl_ClipDistance, })
0:? 'cs' (layout(location=10 ) smooth out 2-element array of structure{7-element array of 3X2 matrix of float m, float f})
0:? 'cf' (layout(location=54 ) smooth out float)
0:? 'cg' (layout(location=53 ) smooth out float)
0:? 'alias1' (layout(location=10 ) in 4-component vector of float)
0:? 'alias2' (layout(location=10 ) in 4-component vector of float)
0:? 'v6e' (layout(location=0 ) in 4-component vector of float)
0:? 'ininst2e' (in block{layout(location=25 ) in float f2})
0:? 'in4e' (in block{layout(location=50 ) in float f1, layout(location=51 ) in float f2})
0:? 'inst4e' (layout(column_major std140 align=16 ) uniform block{layout(column_major std140 offset=0 align=16 ) uniform int a})
0:? 'inst9e' (layout(column_major shared align=32 ) uniform block{layout(column_major shared offset=12 align=4 ) uniform float f, layout(column_major shared offset=20 ) uniform float g})
0:? 'spinste' (layout(column_major std140 ) uniform block{layout(column_major std140 offset=0 ) uniform 4-component vector of float a, layout(column_major std140 offset=32 ) uniform 3-component vector of float b})
0:? 'aconste' (4-element array of int)
0:? 'bconste' (64-element array of int)
0:? 'bbinst2' (out block{layout(xfb_buffer=0 xfb_offset=64 ) out 4-component vector of float bbv})
0:? 'bge' (layout(xfb_buffer=2 xfb_offset=48 xfb_stride=80 ) smooth out 4-component vector of float)
0:? 'bhe' (layout(xfb_buffer=3 xfb_offset=32 xfb_stride=64 ) smooth out 4-component vector of float)
0:? 'bbinst4e' (layout(xfb_stride=80 ) out block{layout(xfb_buffer=2 xfb_offset=16 ) out 4-component vector of float bbv1, layout(xfb_buffer=2 xfb_offset=32 ) out 4-component vector of float bbv2})
0:? 'bbinst5e' (out block{layout(xfb_buffer=3 xfb_offset=0 ) out 4-component vector of float bbv1, layout(xfb_buffer=3 xfb_offset=48 xfb_stride=64 ) out 4-component vector of float bbv2})
0:? 'inst4' (layout(column_major std140 align=16 ) uniform block{layout(column_major std140 offset=0 align=16 ) uniform int a})
0:? 'inst9' (layout(column_major std430 align=32 ) uniform block{layout(column_major std430 offset=12 align=4 ) uniform float f, layout(column_major std430 offset=20 align=32 ) uniform float g})
0:? 'spinst' (layout(column_major std140 ) uniform block{layout(column_major std140 offset=0 ) uniform 4-component vector of float a, layout(column_major std140 offset=32 ) uniform 3-component vector of float b})
0:? 'aconst' (4-element array of int)
0:? 'bconst' (64-element array of int)
0:? 'start2' (const int)
0:? 5 (const int)
0:? 'v6' (layout(location=19 ) in 4-component vector of float)
0:? 'ininst2' (in block{layout(location=28 component=0 ) in bool b1, layout(location=29 component=0 ) in float f1, layout(location=25 ) in float f2})
0:? 'in4' (in block{layout(location=50 ) in float f1, layout(location=51 ) in float f2})
0:? 'bbinst2g' (out block{layout(xfb_buffer=3 xfb_offset=64 ) out 4-component vector of float bbv})
0:? 'bg' (layout(xfb_buffer=1 xfb_offset=48 xfb_stride=80 ) smooth out 4-component vector of float)
0:? 'bh' (layout(xfb_buffer=1 xfb_offset=32 xfb_stride=80 ) smooth out 4-component vector of float)
0:? 'bbinst4' (layout(xfb_stride=80 ) out block{layout(xfb_buffer=1 xfb_offset=16 ) out 4-component vector of float bbv1})
0:? 'bbinst5' (out block{layout(xfb_buffer=1 xfb_offset=0 ) out 4-component vector of float bbv1, layout(xfb_buffer=1 xfb_offset=64 xfb_stride=80 ) out 4-component vector of float bbv2})
0:? 'gl_VertexID' (gl_VertexId int)
0:? 'gl_InstanceID' (gl_InstanceId int)