Misc. constant-folding fixes: Check % for 0, mat(mat) constructor, index range checking (within constant objects). Also, rationalize addConst*() methods.

 

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

1 files changed, 4 insertions, 4 deletions

diff --git a/Test/baseResults/array.frag.out b/Test/baseResults/array.frag.out
index dd3fab12..e2046f8a 100644
--- a/Test/baseResults/array.frag.out
+++ b/Test/baseResults/array.frag.out
@@ -6,12 +6,12 @@ ERROR: 0:31: 'assign' :  cannot convert from '4-element array of float' to 'unsi
 ERROR: 0:33: 'foo' : no matching overloaded function found 

 ERROR: 0:42: '[' :  array index out of range '5'

 ERROR: 0:45: '[' :  array index out of range '1000'

-ERROR: 0:46: '[' :  array index out of range '-1'

-ERROR: 0:52: '[' :  array index '2' out of range

+ERROR: 0:46: '[' :  index out of range '-1'

+ERROR: 0:52: '[' :  array index out of range '2'

 ERROR: 0:54: 'const' : non-matching or non-convertible constant type for const initializer 

 ERROR: 0:56: '=' :  cannot convert from 'const 2-element array of int' to '3-element array of int'

 ERROR: 0:57: '[]' : scalar integer expression required 

-ERROR: 0:57: '[' :  array index out of range '-858993459'

+ERROR: 0:57: '[' :  index out of range '-858993459'

 ERROR: 0:58: '[]' : scalar integer expression required 

 ERROR: 14 compilation errors.  No code generated.

 

@@ -157,7 +157,7 @@ ERROR: node is still EOpNull!
 0:52      add second child into first child (int)

 0:52        'sum' (int)

 0:52        Constant:

-0:52          3 (const int)

+0:52          2 (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)