More subtle checking for redeclarations:

 - 300 doesn't allow built-in overload, while 100 does, while neither allows redefining
 - block name can't be reused for block name within the same interface 
   (though, the spec. isn't clear about that, it's easier than verifying member matches, will file bug on it)


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

1 files changed, 77 insertions, 70 deletions

diff --git a/Test/baseResults/430scope.vert.out b/Test/baseResults/430scope.vert.out
index 62dd94ab..4776db80 100644
--- a/Test/baseResults/430scope.vert.out
+++ b/Test/baseResults/430scope.vert.out
@@ -1,9 +1,9 @@
 Warning, version 430 is not yet complete; some version-specific features are present, but many are missing.

 ERROR: 0:5: 'a' : redefinition 

-ERROR: 0:17: 'b' : illegal redeclaration 

+ERROR: 0:17: 'b' : redeclaration of existing name 

 ERROR: 0:19: 'f' : redefinition 

-ERROR: 0:50: 'z' : undeclared identifier 

-ERROR: 0:50: 'z' : redefinition 

+ERROR: 0:54: 'z' : undeclared identifier 

+ERROR: 0:54: 'z' : redefinition 

 ERROR: 5 compilation errors.  No code generated.

 

 ERROR: node is still EOpNull!

@@ -31,76 +31,83 @@ ERROR: node is still EOpNull!
 0:24      Branch: Return with expression

 0:24        Constant:

 0:24          1.000000

-0:29  Function Definition: main( (void)

-0:29    Function Parameters: 

+0:26  Function Definition: radians(b1; (bool)

+0:26    Function Parameters: 

+0:26      'x' (in bool)

+0:28    Sequence

+0:28      Branch: Return with expression

+0:28        Constant:

+0:28          true (const bool)

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

+0:33    Function Parameters: 

 0:?     Sequence

-0:32      Function Call: g( (int)

-0:35      'sin' (float)

-0:37      Function Call: f(i1;i1;i1; (int)

-0:37        Constant:

-0:37          1 (const int)

-0:37        Constant:

-0:37          2 (const int)

-0:37        Constant:

-0:37          3 (const int)

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

-0:40        'f' (float)

-0:40        Constant:

-0:40          3.000000

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

-0:42        gl_Position: direct index for structure (invariant gl_Position 4-component vector of float)

-0:42          '__anon__0' (out block{gl_Position,gl_PointSize,gl_ClipDistance,gl_ClipVertex,gl_FrontColor,gl_BackColor,gl_FrontSecondaryColor,gl_BackSecondaryColor,gl_TexCoord,gl_FogFragCoord})

-0:42          Constant:

-0:42            0 (const uint)

-0:42        Construct vec4 (4-component vector of float)

-0:42          'f' (float)

-0:44      Sequence

-0:44        Sequence

-0:44          move second child to first child (int)

-0:44            'f' (int)

-0:44            Constant:

-0:44              0 (const int)

-0:44        Loop with condition tested first

-0:44          Loop Condition

-0:44          Compare Less Than (bool)

-0:44            'f' (int)

-0:44            Constant:

-0:44              10 (const int)

-0:44          Loop Body

-0:45          Pre-Increment (int)

-0:45            'f' (int)

-0:44          Loop Terminal Expression

-0:44          Pre-Increment (int)

-0:44            'f' (int)

-0:47      Sequence

-0:47        move second child to first child (int)

-0:47          'x' (int)

-0:47          Constant:

-0:47            1 (const int)

-0:49      Sequence

-0:49        Sequence

-0:49          move second child to first child (float)

-0:49            'x' (float)

-0:49            Constant:

-0:49              2.000000

-0:49          move second child to first child (float)

-0:49            'y' (float)

-0:49            'x' (float)

+0:36      Function Call: g( (int)

+0:39      'sin' (float)

+0:41      Function Call: f(i1;i1;i1; (int)

+0:41        Constant:

+0:41          1 (const int)

+0:41        Constant:

+0:41          2 (const int)

+0:41        Constant:

+0:41          3 (const int)

+0:44      move second child to first child (float)

+0:44        'f' (float)

+0:44        Constant:

+0:44          3.000000

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

+0:46        gl_Position: direct index for structure (invariant gl_Position 4-component vector of float)

+0:46          '__anon__0' (out block{gl_Position,gl_PointSize,gl_ClipDistance,gl_ClipVertex,gl_FrontColor,gl_BackColor,gl_FrontSecondaryColor,gl_BackSecondaryColor,gl_TexCoord,gl_FogFragCoord})

+0:46          Constant:

+0:46            0 (const uint)

+0:46        Construct vec4 (4-component vector of float)

+0:46          'f' (float)

+0:48      Sequence

+0:48        Sequence

+0:48          move second child to first child (int)

+0:48            'f' (int)

+0:48            Constant:

+0:48              0 (const int)

+0:48        Loop with condition tested first

+0:48          Loop Condition

+0:48          Compare Less Than (bool)

+0:48            'f' (int)

+0:48            Constant:

+0:48              10 (const int)

+0:48          Loop Body

+0:49          Pre-Increment (int)

+0:49            'f' (int)

+0:48          Loop Terminal Expression

+0:48          Pre-Increment (int)

+0:48            'f' (int)

+0:51      Sequence

+0:51        move second child to first child (int)

+0:51          'x' (int)

+0:51          Constant:

+0:51            1 (const int)

 0:53      Sequence

 0:53        Sequence

-0:53          move second child to first child (int)

-0:53            'x' (int)

-0:53            'x' (int)

-0:61      Sequence

-0:61        Sequence

-0:61          move second child to first child (structure{x})

-0:61            'S' (structure{x})

-0:61            Constant:

-0:61              0 (const int)

-0:62        x: direct index for structure (int)

-0:62          'S' (structure{x})

-0:62          Constant:

-0:62            0 (const int)

+0:53          move second child to first child (float)

+0:53            'x' (float)

+0:53            Constant:

+0:53              2.000000

+0:53          move second child to first child (float)

+0:53            'y' (float)

+0:53            'x' (float)

+0:57      Sequence

+0:57        Sequence

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

+0:57            'x' (int)

+0:57            'x' (int)

+0:65      Sequence

+0:65        Sequence

+0:65          move second child to first child (structure{x})

+0:65            'S' (structure{x})

+0:65            Constant:

+0:65              0 (const int)

+0:66        x: direct index for structure (int)

+0:66          'S' (structure{x})

+0:66          Constant:

+0:66            0 (const int)

 0:?   Linker Objects

 0:?     'b' (bool)

 0:?     'tan' (float)