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

42
Test/baseResults/structure.frag.out
View File

@@ -6,7 +6,8 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:22 Sequence
0:22 move second child to first child (float)
0:22 'scale' (float)
0:22 0.000000
0:22 Constant:
0:22 0.000000
0:24 Test condition and select (void)
0:24 Condition
0:24 Compare Greater Than (bool)
@@ -14,10 +15,14 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:24 i: direct index for structure (5-element array of int)
0:24 direct index (uniform structure)
0:24 'foo2' (uniform 5-element array of structure)
0:24 3 (const int)
0:24 0 (const int)
0:24 4 (const int)
0:24 0 (const int)
0:24 Constant:
0:24 3 (const int)
0:24 Constant:
0:24 0 (const int)
0:24 Constant:
0:24 4 (const int)
0:24 Constant:
0:24 0 (const int)
0:24 true case
0:25 move second child to first child (float)
0:25 'scale' (float)
@@ -28,12 +33,18 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:25 s1_1: direct index for structure (7-element array of structure)
0:25 direct index (uniform structure)
0:25 'foo2' (uniform 5-element array of structure)
0:25 3 (const int)
0:25 Constant:
0:25 3 (const int)
0:25 Constant:
0:25 2 (const int)
0:25 Constant:
0:25 2 (const int)
0:25 Constant:
0:25 2 (const int)
0:25 2 (const int)
0:25 3 (const int)
0:25 0 (const int)
0:25 Constant:
0:25 3 (const int)
0:25 Constant:
0:25 0 (const int)
0:24 false case
0:27 move second child to first child (float)
0:27 'scale' (float)
@@ -43,11 +54,16 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:27 s1_1: direct index for structure (7-element array of structure)
0:27 direct index (uniform structure)
0:27 'foo2' (uniform 5-element array of structure)
0:27 3 (const int)
0:27 Constant:
0:27 3 (const int)
0:27 Constant:
0:27 2 (const int)
0:27 Constant:
0:27 2 (const int)
0:27 2 (const int)
0:27 1 (const int)
0:27 3 (const int)
0:27 Constant:
0:27 1 (const int)
0:27 Constant:
0:27 3 (const int)
0:29 move second child to first child (4-component vector of float)
0:29 'gl_FragColor' (fragColor 4-component vector of float)
0:29 vector-scale (4-component vector of float)