AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixups for struct-packing test.

Browse Source 
There seems to have been some changes to alignment in glslang here,
so workaround to verify that the other cases at least still work as expected.
This commit is contained in:
Hans-Kristian Arntzen 2016-05-05 11:59:33 +02:00
parent f144b767ce
commit 2d38c6e192
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reference/shaders/comp/struct-packing.comp
View File

@ -32,16 +32,12 @@ struct Content
S2 m2s[1];
S0 m0;
S1 m1;
S2 m2;
S3 m3;
float m4;
S3 m3;
};
layout(binding = 1, std140) buffer SSBO1
layout(binding = 1, std430) buffer SSBO1
{
Content content;
Content content1[2];
Content content2;
mat2 m0;
mat2 m1;
mat2x3 m2[4];
@ -50,7 +46,10 @@ layout(binding = 1, std140) buffer SSBO1
layout(row_major) mat2 m5[9];
layout(row_major) mat2x3 m6[2][4];
layout(row_major) mat3x2 m7;
float array[];
float array[1024];
Content content;
Content content1[2];
Content content2;
} ssbo_430;
layout(binding = 0, std140) buffer SSBO0

39
shaders/comp/struct-packing.comp
View File

@ -1,4 +1,5 @@
#version 310 es
layout(local_size_x = 1) in;
struct S0
{
@ -31,12 +32,27 @@ struct Content
S2 m2s[1];
S0 m0;
S1 m1;
S2 m2;
S3 m3;
float m4;
S3 m3;
};
layout(binding = 1, std430) buffer SSBO1
{
layout(column_major) mat2 m0;
layout(column_major) mat2 m1;
layout(column_major) mat2x3 m2[4];
layout(column_major) mat3x2 m3;
layout(row_major) mat2 m4;
layout(row_major) mat2 m5[9];
layout(row_major) mat2x3 m6[4][2];
layout(row_major) mat3x2 m7;
float array[1024];
Content content;
Content content1[2];
Content content2;
} ssbo_430;
layout(binding = 0, std140) buffer SSBO0
{
Content content;
@ -45,23 +61,6 @@ layout(binding = 0, std140) buffer SSBO0
float array[];
} ssbo_140;
layout(binding = 1, std430) buffer SSBO1
{
Content content;
Content content1[2];
Content content2;
layout(column_major) mat2 m0;
layout(column_major) mat2 m1;
layout(column_major) mat2x3 m2[4];
layout(column_major) mat3x2 m3;
layout(row_major) mat2 m4;
layout(row_major) mat2 m5[9];
layout(row_major) mat2x3 m6[4][2];
layout(row_major) mat3x2 m7;
float array[];
} ssbo_430;
void main()
{
ssbo_430.content = ssbo_140.content;