mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
John Kessenich
2013-09-28 04:02:08 +00:00
parent b3345c422d
commit f2ee3dd46a
98 changed files with 3007 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Test/baseResults/loopsArtificial.frag.out
View File

@@ -12,7 +12,8 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
0:71 Compare Less Than (bool)
0:71 direct index (float)
0:71 'color' (4-component vector of float)
0:71 2 (const int)
0:71 Constant:
0:71 2 (const int)
0:71 'd4' (uniform float)
0:71 Loop Body
0:59 Sequence
@@ -24,54 +25,63 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
0:60 Compare Less Than (bool)
0:60 direct index (float)
0:60 'color' (4-component vector of float)
0:60 0 (const int)
0:60 Constant:
0:60 0 (const int)
0:60 'd4' (uniform float)
0:60 true case
0:61 Sequence
0:61 add second child into first child (float)
0:61 direct index (float)
0:61 'color' (4-component vector of float)
0:61 2 (const int)
0:61 2.000000
0:61 Constant:
0:61 2 (const int)
0:61 Constant:
0:61 2.000000
0:62 Test condition and select (void)
0:62 Condition
0:62 Compare Less Than (bool)
0:62 direct index (float)
0:62 'color' (4-component vector of float)
0:62 2 (const int)
0:62 Constant:
0:62 2 (const int)
0:62 'd4' (uniform float)
0:62 true case
0:63 Sequence
0:63 Post-Increment (float)
0:63 direct index (float)
0:63 'color' (4-component vector of float)
0:63 0 (const int)
0:63 Constant:
0:63 0 (const int)
0:64 Branch: Continue
0:67 Test condition and select (void)
0:67 Condition
0:67 Compare Less Than (bool)
0:67 direct index (float)
0:67 'color' (4-component vector of float)
0:67 1 (const int)
0:67 Constant:
0:67 1 (const int)
0:67 'd4' (uniform float)
0:67 true case
0:68 add second child into first child (float)
0:68 direct index (float)
0:68 'color' (4-component vector of float)
0:68 1 (const int)
0:68 Constant:
0:68 1 (const int)
0:68 'd4' (uniform float)
0:67 false case
0:70 add second child into first child (float)
0:70 direct index (float)
0:70 'color' (4-component vector of float)
0:70 0 (const int)
0:70 Constant:
0:70 0 (const int)
0:70 'd4' (uniform float)
0:74 Loop with condition tested first
0:74 Loop Condition
0:74 Compare Less Than (bool)
0:74 direct index (float)
0:74 'color' (4-component vector of float)
0:74 3 (const int)
0:74 Constant:
0:74 3 (const int)
0:74 'd13' (uniform float)
0:74 Loop Body
0:75 Sequence
@@ -80,7 +90,8 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
0:75 Compare Less Than (bool)
0:75 direct index (float)
0:75 'color' (4-component vector of float)
0:75 2 (const int)
0:75 Constant:
0:75 2 (const int)
0:75 'd13' (uniform float)
0:75 true case
0:76 Post-Increment (4-component vector of float)
@@ -96,47 +107,55 @@ WARNING: 0:14: varying deprecated in version 130; may be removed in future relea
0:81 Compare Less Than (bool)
0:81 direct index (float)
0:81 'color' (4-component vector of float)
0:81 0 (const int)
0:81 Constant:
0:81 0 (const int)
0:81 'd4' (uniform float)
0:81 true case
0:82 Sequence
0:82 add second child into first child (float)
0:82 direct index (float)
0:82 'color' (4-component vector of float)
0:82 2 (const int)
0:82 2.000000
0:82 Constant:
0:82 2 (const int)
0:82 Constant:
0:82 2.000000
0:83 Test condition and select (void)
0:83 Condition
0:83 Compare Less Than (bool)
0:83 direct index (float)
0:83 'color' (4-component vector of float)
0:83 2 (const int)
0:83 Constant:
0:83 2 (const int)
0:83 'd4' (uniform float)
0:83 true case
0:84 Sequence
0:84 Post-Increment (float)
0:84 direct index (float)
0:84 'color' (4-component vector of float)
0:84 0 (const int)
0:84 Constant:
0:84 0 (const int)
0:85 Branch: Continue
0:88 Test condition and select (void)
0:88 Condition
0:88 Compare Less Than (bool)
0:88 direct index (float)
0:88 'color' (4-component vector of float)
0:88 1 (const int)
0:88 Constant:
0:88 1 (const int)
0:88 'd4' (uniform float)
0:88 true case
0:89 add second child into first child (float)
0:89 direct index (float)
0:89 'color' (4-component vector of float)
0:89 1 (const int)
0:89 Constant:
0:89 1 (const int)
0:89 'd4' (uniform float)
0:88 false case
0:91 add second child into first child (float)
0:91 direct index (float)
0:91 'color' (4-component vector of float)
0:91 0 (const int)
0:91 Constant:
0:91 0 (const int)
0:91 'd4' (uniform float)
0:94 Post-Increment (4-component vector of float)
0:94 'color' (4-component vector of float)