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

1 files changed, 274 insertions, 1 deletions

diff --git a/Test/baseResults/100.frag.out b/Test/baseResults/100.frag.out
index 6a74e777..bf72cd8f 100644
--- a/Test/baseResults/100.frag.out
+++ b/Test/baseResults/100.frag.out
@@ -331,7 +331,7 @@ ERROR: node is still EOpNull!
 0:?     'uint' (mediump int)

 0:?     'v' (smooth in 3-element array of mediump 4-component vector of float)

 0:?     'f' (mediump float)

-0:?     '__anon__0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump int x})

+0:?     'anon@0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump int x})

 0:?     'fa' (implicitly-sized array of mediump float)

 0:?     'f13' (mediump float)

 0:?     'fi' (invariant mediump float)

@@ -361,4 +361,277 @@ Requested GL_EXT_shader_texture_lod
 Requested GL_OES_EGL_image_external

 Requested GL_OES_standard_derivatives

 Requested GL_OES_texture_3D

+ERROR: node is still EOpNull!

+0:3  Sequence

+0:3    move second child to first child (3-element array of mediump int)

+0:3      'a' (3-element array of mediump int)

+0:3      Constant:

+0:3        2 (const int)

+0:3        3 (const int)

+0:3        4 (const int)

+0:17  Function Definition: main( (void)

+0:17    Function Parameters: 

+0:19    Sequence

+0:19      Constant:

+0:19        0.000000

+0:20      Sequence

+0:20        move second child to first child (mediump int)

+0:20          's' (mediump int)

+0:20          Constant:

+0:20            16 (const int)

+0:21      move second child to first child (mediump int)

+0:21        's' (mediump int)

+0:21        Constant:

+0:21          4 (const int)

+0:22      Test condition and select (void)

+0:22        Condition

+0:22        Compare Equal (bool)

+0:22          'a' (3-element array of mediump int)

+0:22          'a' (3-element array of mediump int)

+0:22        true case is null

+0:24      move second child to first child (mediump int)

+0:24        'b' (mediump int)

+0:24        bitwise and (mediump int)

+0:24          'c' (mediump int)

+0:24          Constant:

+0:24            4 (const int)

+0:25      move second child to first child (mediump int)

+0:25        'b' (mediump int)

+0:25        mod (mediump int)

+0:25          'c' (mediump int)

+0:25          Constant:

+0:25            4 (const int)

+0:26      move second child to first child (mediump int)

+0:26        'b' (mediump int)

+0:26        inclusive-or (mediump int)

+0:26          'c' (mediump int)

+0:26          Constant:

+0:26            4 (const int)

+0:27      right shift second child into first child (mediump int)

+0:27        'b' (mediump int)

+0:27        Constant:

+0:27          2 (const int)

+0:28      left shift second child into first child (mediump int)

+0:28        'b' (mediump int)

+0:28        Constant:

+0:28          2 (const int)

+0:29      mod second child into first child (mediump int)

+0:29        'b' (mediump int)

+0:29        Constant:

+0:29          3 (const int)

+0:36      move second child to first child (structure{mediump float f, 10-element array of mediump float a})

+0:36        's1' (structure{mediump float f, 10-element array of mediump float a})

+0:36        's2' (structure{mediump float f, 10-element array of mediump float a})

+0:37      Test condition and select (void)

+0:37        Condition

+0:37        Compare Equal (bool)

+0:37          's1' (structure{mediump float f, 10-element array of mediump float a})

+0:37          's2' (structure{mediump float f, 10-element array of mediump float a})

+0:37        true case is null

+0:38      Test condition and select (void)

+0:38        Condition

+0:38        Compare Not Equal (bool)

+0:38          's1' (structure{mediump float f, 10-element array of mediump float a})

+0:38          's2' (structure{mediump float f, 10-element array of mediump float 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:87  Function Definition: foo234( (void)

+0:87    Function Parameters: 

+0:89    Sequence

+0:89      Function Call: texture3D(s31;vf3;f1; (highp 4-component vector of float)

+0:89        's3D2' (uniform highp sampler3D)

+0:89        Constant:

+0:89          0.200000

+0:89          0.200000

+0:89          0.200000

+0:89        Constant:

+0:89          0.200000

+0:90      Function Call: texture3DProj(s31;vf4;f1; (highp 4-component vector of float)

+0:90        's3D2' (uniform highp sampler3D)

+0:90        direct index (smooth mediump 4-component vector of float)

+0:90          'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:90          Constant:

+0:90            1 (const int)

+0:90        Constant:

+0:90          0.400000

+0:91      dPdx (mediump 4-component vector of float)

+0:91        direct index (smooth mediump 4-component vector of float)

+0:91          'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:91          Constant:

+0:91            0 (const int)

+0:92      Constant:

+0:92        0.000000

+0:93      fwidth (mediump float)

+0:93        'f13' (invariant mediump float)

+0:98  Function Definition: foo236( (void)

+0:98    Function Parameters: 

+0:100    Sequence

+0:100      dPdx (mediump 4-component vector of float)

+0:100        direct index (smooth mediump 4-component vector of float)

+0:100          'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:100          Constant:

+0:100            0 (const int)

+0:101      Constant:

+0:101        0.000000

+0:102      fwidth (mediump float)

+0:102        'f13' (invariant mediump float)

+0:103      move second child to first child (mediump float)

+0:103        'gl_FragDepth' (mediump float)

+0:103        'f13' (invariant mediump float)

+0:104      move second child to first child (highp float)

+0:104        'gl_FragDepthEXT' (gl_FragDepth highp float)

+0:104        'f13' (invariant mediump float)

+0:109  Function Definition: foo239( (void)

+0:109    Function Parameters: 

+0:111    Sequence

+0:111      move second child to first child (mediump float)

+0:111        'gl_FragDepth' (mediump float)

+0:111        'f13' (invariant mediump float)

+0:112      move second child to first child (highp float)

+0:112        'gl_FragDepthEXT' (gl_FragDepth highp float)

+0:112        'f13' (invariant mediump float)

+0:119  Function Definition: foo245( (void)

+0:119    Function Parameters: 

+0:121    Sequence

+0:121      Function Call: texture2D(sE21;vf2; (lowp 4-component vector of float)

+0:121        'sExt' (uniform lowp samplerExternalOES)

+0:121        Constant:

+0:121          0.200000

+0:121          0.200000

+0:122      Function Call: texture2DProj(sE21;vf3; (lowp 4-component vector of float)

+0:122        'sExt' (uniform lowp samplerExternalOES)

+0:122        Construct vec3 (3-component vector of float)

+0:122          'f13' (invariant mediump float)

+0:123      Function Call: texture2DProj(sE21;vf4; (lowp 4-component vector of float)

+0:123        'sExt' (uniform lowp samplerExternalOES)

+0:123        direct index (smooth mediump 4-component vector of float)

+0:123          'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:123          Constant:

+0:123            2 (const int)

+0:130  Function Definition: foo246( (void)

+0:130    Function Parameters: 

+0:132    Sequence

+0:132      Function Call: texture2D(sE21;vf2; (mediump 4-component vector of float)

+0:132        'mediumExt' (uniform mediump samplerExternalOES)

+0:132        Constant:

+0:132          0.200000

+0:132          0.200000

+0:133      Function Call: texture2DProj(sE21;vf4; (highp 4-component vector of float)

+0:133        'highExt' (uniform highp samplerExternalOES)

+0:133        direct index (smooth mediump 4-component vector of float)

+0:133          'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:133          Constant:

+0:133            2 (const int)

+0:134      Constant:

+0:134        0.000000

+0:135      Constant:

+0:135        0.000000

+0:137      Bitwise not (mediump int)

+0:137        'a' (mediump int)

+0:138      inclusive-or (mediump int)

+0:138        'a' (mediump int)

+0:138        'a' (mediump int)

+0:139      bitwise and (mediump int)

+0:139        'a' (mediump int)

+0:139        'a' (mediump int)

+0:145  Function Definition: foo203940(i1;f1;f1; (mediump int)

+0:145    Function Parameters: 

+0:145      'a' (in mediump int)

+0:145      'b' (in mediump float)

+0:147    Sequence

+0:147      Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (lowp 4-component vector of float)

+0:147        's2Dg' (uniform lowp sampler2D)

+0:147        Construct vec3 (3-component vector of float)

+0:147          'f13' (invariant mediump float)

+0:147        'uv2' (invariant uniform mediump 2-component vector of float)

+0:147        'uv2' (invariant uniform mediump 2-component vector of float)

+0:148      Branch: Return with expression

+0:148        'a' (in mediump int)

+0:151  Sequence

+0:151    move second child to first child (mediump float)

+0:151      'f123' (mediump float)

+0:151      Constant:

+0:151        4.000000

+0:152  Sequence

+0:152    move second child to first child (mediump float)

+0:152      'f124' (mediump float)

+0:152      Constant:

+0:152        50000000000.000000

+0:158  Function Definition: foo323433( (void)

+0:158    Function Parameters: 

+0:160    Sequence

+0:160      Function Call: texture2DLodEXT(s21;vf2;f1; (lowp 4-component vector of float)

+0:160        's2Dg' (uniform lowp sampler2D)

+0:160        'uv2' (invariant uniform mediump 2-component vector of float)

+0:160        'f13' (invariant mediump float)

+0:161      Function Call: texture2DProjGradEXT(s21;vf3;vf2;vf2; (lowp 4-component vector of float)

+0:161        's2Dg' (uniform lowp sampler2D)

+0:161        Construct vec3 (3-component vector of float)

+0:161          'f13' (invariant mediump float)

+0:161        'uv2' (invariant uniform mediump 2-component vector of float)

+0:161        'uv2' (invariant uniform mediump 2-component vector of float)

+0:162      Function Call: texture2DGradEXT(s21;vf2;vf2;vf2; (lowp 4-component vector of float)

+0:162        's2Dg' (uniform lowp sampler2D)

+0:162        'uv2' (invariant uniform mediump 2-component vector of float)

+0:162        'uv2' (invariant uniform mediump 2-component vector of float)

+0:162        'uv2' (invariant uniform mediump 2-component vector of float)

+0:163      Function Call: textureCubeGradEXT(sC1;vf3;vf3;vf3; (lowp 4-component vector of float)

+0:163        'sCube' (uniform lowp samplerCube)

+0:163        Construct vec3 (3-component vector of float)

+0:163          'f13' (invariant mediump float)

+0:163        Construct vec3 (3-component vector of float)

+0:163          'f13' (invariant mediump float)

+0:163        Construct vec3 (3-component vector of float)

+0:163          'f13' (invariant mediump float)

+0:167  Function Definition: fgfg(f1;i1; (mediump int)

+0:167    Function Parameters: 

+0:167      'f' (in mediump float)

+0:167      'i' (in highp int)

+0:167    Sequence

+0:167      Branch: Return with expression

+0:167        Constant:

+0:167          2 (const int)

+0:173  Function Definition: gggf(f1; (mediump int)

+0:173    Function Parameters: 

+0:173      'f' (in mediump float)

+0:173    Sequence

+0:173      Branch: Return with expression

+0:173        Constant:

+0:173          2 (const int)

+0:175  Function Definition: agggf(f1; (mediump int)

+0:175    Function Parameters: 

+0:175      'f' (in mediump float)

+0:175    Sequence

+0:175      Branch: Return with expression

+0:175        Constant:

+0:175          2 (const int)

+0:?   Linker Objects

+0:?     'a' (3-element array of mediump int)

+0:?     'uint' (mediump int)

+0:?     'v' (smooth in 3-element array of mediump 4-component vector of float)

+0:?     'f' (mediump float)

+0:?     'anon@0' (layout(column_major shared ) uniform block{layout(column_major shared ) uniform mediump int x})

+0:?     'fa' (1-element 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)

+0:?     's3D' (uniform mediump sampler3D)

+0:?     's3D2' (uniform highp sampler3D)

+0:?     'sExt' (uniform lowp samplerExternalOES)

+0:?     'mediumExt' (uniform mediump samplerExternalOES)

+0:?     'highExt' (uniform highp samplerExternalOES)

+0:?     's2Dg' (uniform lowp sampler2D)

+0:?     'f123' (mediump float)

+0:?     'f124' (mediump float)

+0:?     'sCube' (uniform lowp samplerCube)

+0:?     's' (smooth in structure{mediump float f})