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

58
Test/baseResults/aggOps.frag.out
View File

@@ -11,41 +11,51 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:27 Convert float to int (int)
0:27 direct index (float)
0:27 'u' (smooth in 4-component vector of float)
0:27 0 (const int)
0:27 Constant:
0:27 0 (const int)
0:27 direct index (float)
0:27 'u' (smooth in 4-component vector of float)
0:27 1 (const int)
0:27 Constant:
0:27 1 (const int)
0:27 Construct structure (structure)
0:27 Convert float to int (int)
0:27 direct index (float)
0:27 'u' (smooth in 4-component vector of float)
0:27 2 (const int)
0:27 Constant:
0:27 2 (const int)
0:27 direct index (float)
0:27 'u' (smooth in 4-component vector of float)
0:27 3 (const int)
0:27 14 (const int)
0:27 14.000000
0:27 Constant:
0:27 3 (const int)
0:27 Constant:
0:27 14 (const int)
0:27 14.000000
0:28 move second child to first child (3-element array of structure)
0:28 'b' (3-element array of structure)
0:28 Construct structure (3-element array of structure)
0:28 17 (const int)
0:28 17.000000
0:28 Constant:
0:28 17 (const int)
0:28 17.000000
0:28 Construct structure (structure)
0:28 Convert float to int (int)
0:28 direct index (float)
0:28 'w' (smooth in 4-component vector of float)
0:28 0 (const int)
0:28 Constant:
0:28 0 (const int)
0:28 direct index (float)
0:28 'w' (smooth in 4-component vector of float)
0:28 1 (const int)
0:28 Constant:
0:28 1 (const int)
0:28 Construct structure (structure)
0:28 Convert float to int (int)
0:28 direct index (float)
0:28 'w' (smooth in 4-component vector of float)
0:28 2 (const int)
0:28 Constant:
0:28 2 (const int)
0:28 direct index (float)
0:28 'w' (smooth in 4-component vector of float)
0:28 3 (const int)
0:28 Constant:
0:28 3 (const int)
0:30 Test condition and select (void)
0:30 Condition
0:30 Compare Equal (bool)
@@ -63,7 +73,8 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:33 Function Call: texture2D(s21;vf2; (4-component vector of float)
0:33 'sampler' (uniform sampler2D)
0:33 vector-scale (2-component vector of float)
0:33 2.000000
0:33 Constant:
0:33 2.000000
0:33 'coord' (smooth in 2-component vector of float)
0:35 Test condition and select (void)
0:35 Condition
@@ -73,7 +84,8 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:35 true case
0:36 vector scale second child into first child (4-component vector of float)
0:36 'v' (4-component vector of float)
0:36 3.000000
0:36 Constant:
0:36 3.000000
0:38 Test condition and select (void)
0:38 Condition
0:38 Compare Not Equal (bool)
@@ -82,7 +94,8 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:38 true case
0:39 vector scale second child into first child (4-component vector of float)
0:39 'v' (4-component vector of float)
0:39 4.000000
0:39 Constant:
0:39 4.000000
0:41 Test condition and select (void)
0:41 Condition
0:41 Compare Equal (bool)
@@ -90,12 +103,15 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:41 vector swizzle (2-component vector of float)
0:41 'v' (4-component vector of float)
0:41 Sequence
0:41 1 (const int)
0:41 3 (const int)
0:41 Constant:
0:41 1 (const int)
0:41 Constant:
0:41 3 (const int)
0:41 true case
0:42 vector scale second child into first child (4-component vector of float)
0:42 'v' (4-component vector of float)
0:42 5.000000
0:42 Constant:
0:42 5.000000
0:44 Test condition and select (void)
0:44 Condition
0:44 Compare Equal (bool)
@@ -104,7 +120,8 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:44 true case
0:45 vector scale second child into first child (4-component vector of float)
0:45 'v' (4-component vector of float)
0:45 6.000000
0:45 Constant:
0:45 6.000000
0:47 Test condition and select (void)
0:47 Condition
0:47 Compare Not Equal (bool)
@@ -113,7 +130,8 @@ WARNING: 0:6: varying deprecated in version 130; may be removed in future releas
0:47 true case
0:48 vector scale second child into first child (4-component vector of float)
0:48 'v' (4-component vector of float)
0:48 7.000000
0:48 Constant:
0:48 7.000000
0:50 move second child to first child (4-component vector of float)
0:50 'gl_FragColor' (fragColor 4-component vector of float)
0:50 'v' (4-component vector of float)