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

Support align/offset for all versions GLSL/ESSL targeting SPIR-V.

Browse Source
This commit is contained in:
John Kessenich
2017-02-13 09:09:04 -07:00
parent e4e8f7b7a3
commit 7225a1cb1e
6 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/spv.140.frag.out
View File

@@ -54,7 +54,7 @@ spv.140.frag
MemberDecorate 87(bn) 3 Offset 576
MemberDecorate 87(bn) 3 MatrixStride 16
MemberDecorate 87(bn) 4 RowMajor
MemberDecorate 87(bn) 4 Offset 640
MemberDecorate 87(bn) 4 Offset 1024
MemberDecorate 87(bn) 4 MatrixStride 16
Decorate 87(bn) Block
Decorate 89 DescriptorSet 0

2
Test/baseResults/spv.300layout.vert.out
View File

@@ -61,7 +61,7 @@ Warning, version 310 is not yet complete; most version-specific features are pre
MemberDecorate 45(T3) 2 ColMajor
MemberDecorate 45(T3) 2 Offset 128
MemberDecorate 45(T3) 2 MatrixStride 16
MemberDecorate 45(T3) 3 Offset 160
MemberDecorate 45(T3) 3 Offset 2048
Decorate 45(T3) Block
Decorate 47 DescriptorSet 0
MemberDecorate 78(T2) 0 Offset 0

2
Test/spv.140.frag
View File

@@ -14,7 +14,7 @@ layout(std140) uniform bn {
layout(column_major) mat4 matca[4];
layout(row_major) mat4 matr;
layout(column_major) mat4 matc;
mat4 matrdef;
layout(align=512, offset=1024) mat4 matrdef;
};
uniform sampler2DRect sampR;

2
Test/spv.300layout.vert
View File

@@ -25,7 +25,7 @@ layout(column_major) uniform T3 { // shared and column_major
mat4 M3; // column_major
layout(row_major) mat4 M4; // row major
mat2x3 N2; // column_major
uvec3 uv3a[4];
layout(align=16, offset=2048) uvec3 uv3a[4];
};
in uint uiuin;