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

Minor infrastructure changes, to simplify an upcoming check in:

Browse Source 
- print out block member types when printing a block (makes all test results change)
 - const versions of all intermediate.h type-identification methods
 - layoutSlotLocation -> layoutLocation

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24664 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2014-01-06 21:27:56 +00:00
parent 7054075804
commit 7cbfdf4394
50 changed files with 592 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Test/baseResults/variableArrayIndex.frag.out
View File

@@ -14,9 +14,9 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:34 Condition
0:34 Compare Greater Than (bool)
0:34 i: direct index for structure (int)
0:34 direct index (structure{i,f,s1_1})
0:34 s2_1: direct index for structure (3-element array of structure{i,f,s1_1})
0:34 'foo3' (uniform structure{s2_1,i,f,s1_1})
0:34 direct index (structure{int i, float f, structure{int i, float f} s1_1})
0:34 s2_1: direct index for structure (3-element array of structure{int i, float f, structure{int i, float f} s1_1})
0:34 'foo3' (uniform structure{3-element array of structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
0:34 Constant:
0:34 0 (const int)
0:34 Constant:
@@ -29,19 +29,19 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:35 move second child to first child (float)
0:35 'scale' (float)
0:35 f: direct index for structure (float)
0:35 s1_1: direct index for structure (structure{i,f})
0:35 indirect index (structure{i,f,s1_1})
0:35 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:35 s1_1: direct index for structure (structure{int i, float f})
0:35 indirect index (structure{int i, float f, structure{int i, float f} s1_1})
0:35 'foo2' (uniform 5-element array of structure{int i, float f, structure{int i, float f} s1_1})
0:35 add (int)
0:35 add (int)
0:35 i: direct index for structure (int)
0:35 indirect index (structure{i,f,s1_1})
0:35 s2_1: direct index for structure (3-element array of structure{i,f,s1_1})
0:35 'foo3' (uniform structure{s2_1,i,f,s1_1})
0:35 indirect index (structure{int i, float f, structure{int i, float f} s1_1})
0:35 s2_1: direct index for structure (3-element array of structure{int i, float f, structure{int i, float f} s1_1})
0:35 'foo3' (uniform structure{3-element array of structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
0:35 Constant:
0:35 0 (const int)
0:35 i: direct index for structure (int)
0:35 'foo' (uniform structure{i,f})
0:35 'foo' (uniform structure{int i, float f})
0:35 Constant:
0:35 0 (const int)
0:35 Constant:
@@ -58,10 +58,10 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:37 move second child to first child (float)
0:37 'scale' (float)
0:37 f: direct index for structure (float)
0:37 s1_1: direct index for structure (structure{i,f})
0:37 direct index (structure{i,f,s1_1})
0:37 s2_1: direct index for structure (3-element array of structure{i,f,s1_1})
0:37 'foo3' (uniform structure{s2_1,i,f,s1_1})
0:37 s1_1: direct index for structure (structure{int i, float f})
0:37 direct index (structure{int i, float f, structure{int i, float f} s1_1})
0:37 s2_1: direct index for structure (3-element array of structure{int i, float f, structure{int i, float f} s1_1})
0:37 'foo3' (uniform structure{3-element array of structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
0:37 Constant:
0:37 0 (const int)
0:37 Constant:
@@ -93,21 +93,21 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:46 indirect index (2-component vector of float)
0:46 'constructed' (3-element array of 2-component vector of float)
0:46 i: direct index for structure (int)
0:46 'foo' (uniform structure{i,f})
0:46 'foo' (uniform structure{int i, float f})
0:46 Constant:
0:46 0 (const int)
0:46 indirect index (2-component vector of float)
0:46 'constructed' (3-element array of 2-component vector of float)
0:46 i: direct index for structure (int)
0:46 'foo' (uniform structure{i,f})
0:46 'foo' (uniform structure{int i, float f})
0:46 Constant:
0:46 0 (const int)
0:? Linker Objects
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
0:? 'foo' (uniform structure{i,f})
0:? 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:? 'foo3' (uniform structure{s2_1,i,f,s1_1})
0:? 'foo' (uniform structure{int i, float f})
0:? 'foo2' (uniform 5-element array of structure{int i, float f, structure{int i, float f} s1_1})
0:? 'foo3' (uniform structure{3-element array of structure{int i, float f, structure{int i, float f} s1_1} s2_1, int i, float f, structure{int i, float f} s1_1})
0:? 'Count' (uniform int)