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

Merge pull request #1002 from amdrexu/bugfix

Browse Source 
SPV: Memory qualifiers should decorate top-level block members
This commit is contained in:
John Kessenich 2017-07-28 01:35:42 +09:00 committed by GitHub
commit 38151b2f45
5 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/GlslangToSpv.cpp
View File

@ -2531,7 +2531,9 @@ void TGlslangToSpvTraverser::decorateStructType(const glslang::TType& type,
} }
addMemberDecoration(spvType, member, TranslateInvariantDecoration(memberQualifier)); addMemberDecoration(spvType, member, TranslateInvariantDecoration(memberQualifier));
if (qualifier.storage == glslang::EvqBuffer) { if (type.getBasicType() == glslang::EbtBlock &&
qualifier.storage == glslang::EvqBuffer) {
// Add memory decorations only to top-level members of shader storage block
std::vector<spv::Decoration> memory; std::vector<spv::Decoration> memory;
TranslateMemoryDecoration(memberQualifier, memory); TranslateMemoryDecoration(memberQualifier, memory);
for (unsigned int i = 0; i < memory.size(); ++i) for (unsigned int i = 0; i < memory.size(); ++i)

2
Test/baseResults/hlsl.structbuffer.coherent.frag.out
View File

@ -208,9 +208,7 @@ gl_FragCoord origin is upper left
MemberDecorate 15(sbuf2) 0 Offset 0 MemberDecorate 15(sbuf2) 0 Offset 0
Decorate 15(sbuf2) BufferBlock Decorate 15(sbuf2) BufferBlock
Decorate 17(sbuf2) DescriptorSet 0 Decorate 17(sbuf2) DescriptorSet 0
MemberDecorate 28(sb_t) 0 Coherent
MemberDecorate 28(sb_t) 0 Offset 0 MemberDecorate 28(sb_t) 0 Offset 0
MemberDecorate 28(sb_t) 1 Coherent
MemberDecorate 28(sb_t) 1 Offset 12 MemberDecorate 28(sb_t) 1 Offset 12
Decorate 29 ArrayStride 16 Decorate 29 ArrayStride 16
MemberDecorate 30(sbuf) 0 Coherent MemberDecorate 30(sbuf) 0 Coherent

3
Test/baseResults/hlsl.structbuffer.frag.out
View File

@ -221,11 +221,8 @@ gl_FragCoord origin is upper left
Name 89 "pos" Name 89 "pos"
Name 92 "@entryPointOutput" Name 92 "@entryPointOutput"
Name 93 "param" Name 93 "param"
MemberDecorate 19(sb_t) 0 NonWritable
MemberDecorate 19(sb_t) 0 Offset 0 MemberDecorate 19(sb_t) 0 Offset 0
MemberDecorate 19(sb_t) 1 NonWritable
MemberDecorate 19(sb_t) 1 Offset 12 MemberDecorate 19(sb_t) 1 Offset 12
MemberDecorate 19(sb_t) 2 NonWritable
MemberDecorate 19(sb_t) 2 Offset 16 MemberDecorate 19(sb_t) 2 Offset 16
Decorate 20 ArrayStride 32 Decorate 20 ArrayStride 32
MemberDecorate 21(sbuf) 0 NonWritable MemberDecorate 21(sbuf) 0 NonWritable

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

@ -44,9 +44,7 @@ spv.memoryQualifier.frag
Decorate 44(iCube) DescriptorSet 0 Decorate 44(iCube) DescriptorSet 0
Decorate 44(iCube) Binding 3 Decorate 44(iCube) Binding 3
Decorate 44(iCube) NonReadable Decorate 44(iCube) NonReadable
MemberDecorate 49(Data) 0 Coherent
MemberDecorate 49(Data) 0 Offset 0 MemberDecorate 49(Data) 0 Offset 0
MemberDecorate 49(Data) 1 Coherent
MemberDecorate 49(Data) 1 Offset 8 MemberDecorate 49(Data) 1 Offset 8
MemberDecorate 50(Buffer) 0 Coherent MemberDecorate 50(Buffer) 0 Coherent
MemberDecorate 50(Buffer) 0 Volatile MemberDecorate 50(Buffer) 0 Volatile

2
Test/baseResults/spv.ssbo.autoassign.frag.out
View File

@ -30,9 +30,7 @@ spv.ssbo.autoassign.frag
Name 92 "pos" Name 92 "pos"
Name 95 "@entryPointOutput" Name 95 "@entryPointOutput"
Name 96 "param" Name 96 "param"
MemberDecorate 14(BufType) 0 NonWritable
MemberDecorate 14(BufType) 0 Offset 0 MemberDecorate 14(BufType) 0 Offset 0
MemberDecorate 14(BufType) 1 NonWritable
MemberDecorate 14(BufType) 1 Offset 16 MemberDecorate 14(BufType) 1 Offset 16
Decorate 15 ArrayStride 32 Decorate 15 ArrayStride 32
MemberDecorate 16(SB0) 0 NonWritable MemberDecorate 16(SB0) 0 NonWritable