Add full support for uniforms with initializers, including intra-stage link validation of aggregate constant initializers.

This included 
 - encapsulating aggregate constants
 - removal of constant-aggregate comparison algorithms, instead using a flattened and direct std::vector comparison
 - adding structure type comparison for independently declared structures that still might match types



git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23274 e7fa87d3-cd2b-0410-9028-fcbf551c1848

1 files changed, 79 insertions, 46 deletions

diff --git a/Test/baseResults/array.frag.out b/Test/baseResults/array.frag.out
index fa745eb3..eac07366 100644
--- a/Test/baseResults/array.frag.out
+++ b/Test/baseResults/array.frag.out
@@ -23,16 +23,20 @@ ERROR: node is still EOpNull!
 0:11        Construct float (4-element array of float)

 0:11          direct index (in float)

 0:11            'a' (in 5-element array of float)

-0:11            0 (const int)

+0:11            Constant:

+0:11              0 (const int)

 0:11          direct index (in float)

 0:11            'a' (in 5-element array of float)

-0:11            1 (const int)

+0:11            Constant:

+0:11              1 (const int)

 0:11          direct index (in float)

 0:11            'a' (in 5-element array of float)

-0:11            2 (const int)

+0:11            Constant:

+0:11              2 (const int)

 0:11          direct index (in float)

 0:11            'a' (in 5-element array of float)

-0:11            3 (const int)

+0:11            Constant:

+0:11              3 (const int)

 0:14  Function Definition: bar(f1[5]; (void)

 0:14    Function Parameters: 

 0:14      '' (in 5-element array of float)

@@ -43,109 +47,138 @@ ERROR: node is still EOpNull!
 0:21        move second child to first child (float)

 0:21          direct index (float)

 0:21            'gu' (2-element array of float)

-0:21            2 (const int)

-0:21          4.000000

+0:21            Constant:

+0:21              2 (const int)

+0:21          Constant:

+0:21            4.000000

 0:24      move second child to first child (float)

 0:24        direct index (float)

 0:24          'gu' (unsized array of float)

-0:24          2 (const int)

-0:24        4.000000

+0:24          Constant:

+0:24            2 (const int)

+0:24        Constant:

+0:24          4.000000

 0:26      move second child to first child (float)

 0:26        direct index (float)

 0:26          'gu' (unsized array of float)

-0:26          3 (const int)

-0:26        3.000000

+0:26          Constant:

+0:26            3 (const int)

+0:26        Constant:

+0:26          3.000000

 0:27      move second child to first child (float)

 0:27        indirect index (float)

 0:27          'gu' (unsized array of float)

 0:27          'a' (uniform int)

-0:27        5.000000

+0:27        Constant:

+0:27          5.000000

 0:29      move second child to first child (4-element array of float)

 0:29        'g4' (4-element array of float)

 0:29        Function Call: foo(f1[5]; (4-element array of float)

 0:29          'g5' (5-element array of float)

 0:30      'g5' (5-element array of float)

 0:31      'gu' (unsized array of float)

-0:33      0.000000

+0:33      Constant:

+0:33        0.000000

 0:34      Function Call: bar(f1[5]; (void)

 0:34        'g5' (5-element array of float)

 0:36      Test condition and select (void)

 0:36        Condition

 0:36        Compare Equal (bool)

-0:36          1.000000

-0:36          2.000000

-0:36          3.000000

-0:36          4.000000

+0:36          Constant:

+0:36            1.000000

+0:36            2.000000

+0:36            3.000000

+0:36            4.000000

 0:36          'g4' (4-element array of float)

 0:36        true case

 0:37        move second child to first child (float)

 0:37          direct index (float)

 0:37            'gu' (unsized array of float)

-0:37            0 (const int)

-0:37          2.000000

+0:37            Constant:

+0:37              0 (const int)

+0:37          Constant:

+0:37            2.000000

 0:40      move second child to first child (float)

 0:40        direct index (float)

 0:40          'u' (5-element array of float)

-0:40          2 (const int)

-0:40        3.000000

+0:40          Constant:

+0:40            2 (const int)

+0:40        Constant:

+0:40          3.000000

 0:42      move second child to first child (float)

 0:42        direct index (float)

 0:42          'u' (5-element array of float)

-0:42          5 (const int)

-0:42        5.000000

+0:42          Constant:

+0:42            5 (const int)

+0:42        Constant:

+0:42          5.000000

 0:43      Function Call: foo(f1[5]; (4-element array of float)

 0:43        'u' (5-element array of float)

 0:45      move second child to first child (4-component vector of float)

 0:45        direct index (fragColor 4-component vector of float)

 0:45          'gl_FragData' (fragColor 32-element array of 4-component vector of float)

-0:45          1000 (const int)

-0:45        1.000000

-0:45        1.000000

-0:45        1.000000

-0:45        1.000000

+0:45          Constant:

+0:45            1000 (const int)

+0:45        Constant:

+0:45          1.000000

+0:45          1.000000

+0:45          1.000000

+0:45          1.000000

 0:46      move second child to first child (4-component vector of float)

 0:46        direct index (fragColor 4-component vector of float)

 0:46          'gl_FragData' (fragColor 32-element array of 4-component vector of float)

-0:46          -1 (const int)

-0:46        1.000000

-0:46        1.000000

-0:46        1.000000

-0:46        1.000000

+0:46          Constant:

+0:46            -1 (const int)

+0:46        Constant:

+0:46          1.000000

+0:46          1.000000

+0:46          1.000000

+0:46          1.000000

 0:47      move second child to first child (4-component vector of float)

 0:47        direct index (fragColor 4-component vector of float)

 0:47          'gl_FragData' (fragColor 32-element array of 4-component vector of float)

-0:47          3 (const int)

-0:47        1.000000

-0:47        1.000000

-0:47        1.000000

-0:47        1.000000

+0:47          Constant:

+0:47            3 (const int)

+0:47        Constant:

+0:47          1.000000

+0:47          1.000000

+0:47          1.000000

+0:47          1.000000

 0:50      Sequence

 0:50        move second child to first child (int)

 0:50          'sum' (int)

-0:50          3 (const int)

+0:50          Constant:

+0:50            3 (const int)

 0:51      add second child into first child (int)

 0:51        'sum' (int)

-0:51        2 (const int)

+0:51        Constant:

+0:51          2 (const int)

 0:52      add second child into first child (int)

 0:52        'sum' (int)

-0:52        3 (const int)

+0:52        Constant:

+0:52          3 (const int)

 0:55      Sequence

 0:55        move second child to first child (2-element array of int)

 0:55          'ica' (2-element array of int)

-0:55          3 (const int)

-0:55          2 (const int)

+0:55          Constant:

+0:55            3 (const int)

+0:55            2 (const int)

 0:57      move second child to first child (int)

 0:57        direct index (int)

 0:57          'ica' (2-element array of int)

-0:57          3.100000

-0:57        3 (const int)

+0:57          Constant:

+0:57            3.100000

+0:57        Constant:

+0:57          3 (const int)

 0:58      move second child to first child (int)

 0:58        indirect index (int)

 0:58          'ica' (2-element array of int)

 0:58          direct index (float)

 0:58            'u' (5-element array of float)

-0:58            1 (const int)

-0:58        4 (const int)

+0:58            Constant:

+0:58              1 (const int)

+0:58        Constant:

+0:58          4 (const int)

 0:?   Linker Objects

 0:?     'gu' (unsized array of float)

 0:?     'g4' (4-element array of float)