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

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

@@ -16,8 +16,8 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:24 Compare Greater Than (bool)
0:24 direct index (int)
0:24 i: direct index for structure (5-element array of int)
0:24 direct index (structure{i,f,s1_1})
0:24 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:24 direct index (structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:24 'foo2' (uniform 5-element array of structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:24 Constant:
0:24 3 (const int)
0:24 Constant:
@@ -32,10 +32,10 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:25 direct index (float)
0:25 direct index (4-component vector of float)
0:25 color: direct index for structure (5-element array of 4-component vector of float)
0:25 direct index (structure{i,f,color})
0:25 s1_1: direct index for structure (7-element array of structure{i,f,color})
0:25 direct index (structure{i,f,s1_1})
0:25 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:25 direct index (structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color})
0:25 s1_1: direct index for structure (7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color})
0:25 direct index (structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:25 'foo2' (uniform 5-element array of structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:25 Constant:
0:25 3 (const int)
0:25 Constant:
@@ -53,10 +53,10 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:27 'scale' (float)
0:27 direct index (float)
0:27 f: direct index for structure (4-element array of float)
0:27 direct index (structure{i,f,color})
0:27 s1_1: direct index for structure (7-element array of structure{i,f,color})
0:27 direct index (structure{i,f,s1_1})
0:27 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:27 direct index (structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color})
0:27 s1_1: direct index for structure (7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color})
0:27 direct index (structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:27 'foo2' (uniform 5-element array of structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
0:27 Constant:
0:27 3 (const int)
0:27 Constant:
@@ -77,8 +77,8 @@ WARNING: 0:3: varying deprecated in version 130; may be removed in future releas
0:? Linker Objects
0:? 'sampler' (uniform sampler2D)
0:? 'coord' (smooth in 2-component vector of float)
0:? 'foo' (uniform structure{i,f,color})
0:? 'foo2' (uniform 5-element array of structure{i,f,s1_1})
0:? 'foo' (uniform structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color})
0:? 'foo2' (uniform 5-element array of structure{5-element array of int i, float f, 7-element array of structure{int i, 4-element array of float f, 5-element array of 4-component vector of float color} s1_1})
Linked fragment stage: