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

Reflection: Implement the std140 block offset calculation rules.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24027 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2013-11-13 05:40:44 +00:00
parent c043498b02
commit 568bc3ae55
5 changed files with 228 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Test/baseResults/reflection.vert.out
View File

@@ -8,26 +8,54 @@ Linked vertex stage:
Uniform reflection:
0:anonMember3: offset 32, type 35666, arraySize 1, index 0
1:s.a: offset -1, type 35666, arraySize 1, index -1
2:anonMember1: offset 0, type 35666, arraySize 1, index 0
3:uf1: offset -1, type 35666, arraySize 1, index -1
4:uf2: offset -1, type 35666, arraySize 1, index -1
5:ablock.member3: offset 32, type 35666, arraySize 1, index 1
0: anonMember3: offset 80, type 35666, arraySize 1, index 0
1: s.a: offset -1, type 35666, arraySize 1, index -1
2: ablock.scalar: offset 12, type 35666, arraySize 1, index 1
3: m23: offset 16, type 35666, arraySize 1, index 0
4: scalarAfterm23: offset 48, type 35666, arraySize 1, index 0
5: c_m23: offset 16, type 35666, arraySize 1, index 2
6: c_scalarAfterm23: offset 64, type 35666, arraySize 1, index 2
7: scalarBeforeArray: offset 96, type 35666, arraySize 1, index 0
8: floatArray: offset 112, type 35666, arraySize 5, index 0
9: scalarAfterArray: offset 192, type 35666, arraySize 1, index 0
10: ablock.memvec2: offset 48, type 35666, arraySize 1, index 1
11: ablock.memf1: offset 56, type 35666, arraySize 1, index 1
12: ablock.memf2: offset 60, type 35666, arraySize 1, index 1
13: ablock.memf3: offset 64, type 35666, arraySize 1, index 1
14: ablock.memvec2a: offset 72, type 35666, arraySize 1, index 1
15: anonMember1: offset 0, type 35666, arraySize 1, index 0
16: uf1: offset -1, type 35666, arraySize 1, index -1
17: uf2: offset -1, type 35666, arraySize 1, index -1
18: ablock.member3: offset 32, type 35666, arraySize 1, index 1
Uniform block reflection:
0: nameless: offset -1, type -1, arraySize 1, index -1
1: ablock: offset -1, type -1, arraySize 1, index -1
2: c_nameless: offset -1, type -1, arraySize 1, index -1
Live names
ablock: 1
ablock.member3: 5
anonMember1: 2
ablock.member3: 18
ablock.memf1: 11
ablock.memf2: 12
ablock.memf3: 13
ablock.memvec2: 10
ablock.memvec2a: 14
ablock.scalar: 2
anonMember1: 15
anonMember3: 0
c_m23: 5
c_nameless: 2
c_scalarAfterm23: 6
floatArray: 8
liveFunction1(: -1
liveFunction2(: -1
m23: 3
nameless: 0
s.a: 1
uf1: 3
uf2: 4
scalarAfterArray: 9
scalarAfterm23: 4
scalarBeforeArray: 7
uf1: 16
uf2: 17

38
Test/reflection.vert
View File

@@ -1,22 +1,41 @@
#version 440 core
uniform nameless {
layout(std140, row_major) uniform nameless {
vec3 anonMember1;
mat3x2 m23;
int scalarAfterm23;
vec4 anonDeadMember2;
vec4 anonMember3;
int scalarBeforeArray;
float floatArray[5];
int scalarAfterArray;
};
uniform named {
layout(std140, column_major) uniform c_nameless {
vec3 c_anonMember1;
mat3x2 c_m23;
int c_scalarAfterm23;
vec4 c_anonDeadMember2;
vec4 c_anonMember3;
};
layout(std140) uniform named {
vec3 deadMember1;
int scalar;
vec4 member2;
vec4 member3;
vec2 memvec2;
float memf1;
bool memf2;
int memf3;
vec2 memvec2a;
} ablock;
uniform namelessdead {
layout(std140) uniform namelessdead {
int a;
};
uniform namedDead {
layout(std140) uniform namedDead {
int b;
} bblock;
@@ -68,6 +87,17 @@ void main()
liveFunction2();
f = anonMember3.z;
f = s.a;
f = ablock.scalar;
f = m23[1].y + scalarAfterm23;
f = c_m23[1].y + c_scalarAfterm23;
f += scalarBeforeArray;
f += floatArray[2];
f += scalarAfterArray;
f += ablock.memvec2.x;
f += ablock.memf1;
f += float(ablock.memf2);
f += ablock.memf3;
f += ablock.memvec2a.y;
} else
f = ufDead3;
}