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

117
Test/baseResults/swizzle.frag.out
View File

@@ -5,7 +5,8 @@
0:11 Sequence
0:11 move second child to first child (float)
0:11 'blendscale' (float)
0:11 1.789000
0:11 Constant:
0:11 1.789000
0:13 Sequence
0:13 move second child to first child (4-component vector of float)
0:13 'w' (4-component vector of float)
@@ -29,69 +30,92 @@
0:20 move second child to first child (float)
0:20 direct index (float)
0:20 'w_reorder' (4-component vector of float)
0:20 2 (const int)
0:20 Constant:
0:20 2 (const int)
0:20 'blendscale' (float)
0:22 move second child to first child (2-component vector of float)
0:22 vector swizzle (2-component vector of float)
0:22 'w' (4-component vector of float)
0:22 Sequence
0:22 3 (const int)
0:22 1 (const int)
0:22 Constant:
0:22 3 (const int)
0:22 Constant:
0:22 1 (const int)
0:22 't' (smooth in 2-component vector of float)
0:24 move second child to first child (float)
0:24 direct index (float)
0:24 'w_reorder' (4-component vector of float)
0:24 0 (const int)
0:24 Constant:
0:24 0 (const int)
0:24 'blendscale' (float)
0:26 move second child to first child (4-component vector of float)
0:26 vector swizzle (4-component vector of float)
0:26 'w2' (4-component vector of float)
0:26 Sequence
0:26 0 (const int)
0:26 1 (const int)
0:26 2 (const int)
0:26 3 (const int)
0:26 Constant:
0:26 0 (const int)
0:26 Constant:
0:26 1 (const int)
0:26 Constant:
0:26 2 (const int)
0:26 Constant:
0:26 3 (const int)
0:26 vector swizzle (4-component vector of float)
0:26 'u' (uniform 4-component vector of float)
0:26 Sequence
0:26 2 (const int)
0:26 3 (const int)
0:26 0 (const int)
0:26 1 (const int)
0:26 Constant:
0:26 2 (const int)
0:26 Constant:
0:26 3 (const int)
0:26 Constant:
0:26 0 (const int)
0:26 Constant:
0:26 1 (const int)
0:28 move second child to first child (float)
0:28 direct index (float)
0:28 'w_reorder' (4-component vector of float)
0:28 1 (const int)
0:28 Constant:
0:28 1 (const int)
0:28 'blendscale' (float)
0:30 move second child to first child (2-component vector of float)
0:30 vector swizzle (2-component vector of float)
0:30 'w_dep' (4-component vector of float)
0:30 Sequence
0:30 0 (const int)
0:30 1 (const int)
0:30 Constant:
0:30 0 (const int)
0:30 Constant:
0:30 1 (const int)
0:30 vector swizzle (2-component vector of float)
0:30 'w2' (4-component vector of float)
0:30 Sequence
0:30 0 (const int)
0:30 2 (const int)
0:30 Constant:
0:30 0 (const int)
0:30 Constant:
0:30 2 (const int)
0:31 move second child to first child (2-component vector of float)
0:31 vector swizzle (2-component vector of float)
0:31 'w_dep' (4-component vector of float)
0:31 Sequence
0:31 2 (const int)
0:31 3 (const int)
0:31 Constant:
0:31 2 (const int)
0:31 Constant:
0:31 3 (const int)
0:31 't' (smooth in 2-component vector of float)
0:33 move second child to first child (2-component vector of float)
0:33 vector swizzle (2-component vector of float)
0:33 'w_undef' (4-component vector of float)
0:33 Sequence
0:33 0 (const int)
0:33 1 (const int)
0:33 Constant:
0:33 0 (const int)
0:33 Constant:
0:33 1 (const int)
0:33 vector swizzle (2-component vector of float)
0:33 'u' (uniform 4-component vector of float)
0:33 Sequence
0:33 2 (const int)
0:33 3 (const int)
0:33 Constant:
0:33 2 (const int)
0:33 Constant:
0:33 3 (const int)
0:35 Test condition and select (void)
0:35 Condition
0:35 'p' (uniform bool)
@@ -99,18 +123,22 @@
0:36 move second child to first child (float)
0:36 direct index (float)
0:36 'w_flow' (4-component vector of float)
0:36 0 (const int)
0:36 Constant:
0:36 0 (const int)
0:36 direct index (float)
0:36 't' (smooth in 2-component vector of float)
0:36 0 (const int)
0:36 Constant:
0:36 0 (const int)
0:35 false case
0:38 move second child to first child (float)
0:38 direct index (float)
0:38 'w_flow' (4-component vector of float)
0:38 0 (const int)
0:38 Constant:
0:38 0 (const int)
0:38 direct index (float)
0:38 't' (smooth in 2-component vector of float)
0:38 1 (const int)
0:38 Constant:
0:38 1 (const int)
0:40 move second child to first child (4-component vector of float)
0:40 'gl_FragColor' (fragColor 4-component vector of float)
0:40 mix (4-component vector of float)
@@ -130,36 +158,45 @@
0:43 Sequence
0:43 move second child to first child (4-component vector of float)
0:43 'rep' (4-component vector of float)
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:43 1.000000
0:43 Constant:
0:43 0.000000
0:43 0.000000
0:43 0.000000
0:43 1.000000
0:45 Test condition and select (void)
0:45 Condition
0:45 Compare Less Than (bool)
0:45 direct index (float)
0:45 'c' (2-component vector of float)
0:45 0 (const int)
0:45 0.000000
0:45 Constant:
0:45 0 (const int)
0:45 Constant:
0:45 0.000000
0:45 true case
0:46 multiply second child into first child (float)
0:46 direct index (float)
0:46 'c' (2-component vector of float)
0:46 0 (const int)
0:46 -1.000000
0:46 Constant:
0:46 0 (const int)
0:46 Constant:
0:46 -1.000000
0:48 Test condition and select (void)
0:48 Condition
0:48 Compare Less Than or Equal (bool)
0:48 direct index (float)
0:48 'c' (2-component vector of float)
0:48 0 (const int)
0:48 1.000000
0:48 Constant:
0:48 0 (const int)
0:48 Constant:
0:48 1.000000
0:48 true case
0:49 move second child to first child (float)
0:49 direct index (float)
0:49 'rep' (4-component vector of float)
0:49 0 (const int)
0:49 3.400000
0:49 Constant:
0:49 0 (const int)
0:49 Constant:
0:49 3.400000
0:51 add second child into first child (4-component vector of float)
0:51 'gl_FragColor' (fragColor 4-component vector of float)
0:51 'rep' (4-component vector of float)