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

Fix #1395: GLSL volatile maps to SPIR-V Volatile and Coherent.

Browse Source 
The major version number was bumped in the previous commit to support
this.
This commit is contained in:
John Kessenich 2018-06-04 15:36:03 -06:00
parent d6c975572e
commit 14b85d3ff3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SPIRV/GlslangToSpv.cpp
View File

@ -340,8 +340,10 @@ void TranslateMemoryDecoration(const glslang::TQualifier& qualifier, std::vector
{ {
if (qualifier.coherent) if (qualifier.coherent)
memory.push_back(spv::DecorationCoherent); memory.push_back(spv::DecorationCoherent);
if (qualifier.volatil) if (qualifier.volatil) {
memory.push_back(spv::DecorationVolatile); memory.push_back(spv::DecorationVolatile);
memory.push_back(spv::DecorationCoherent);
}
if (qualifier.restrict) if (qualifier.restrict)
memory.push_back(spv::DecorationRestrict); memory.push_back(spv::DecorationRestrict);
if (qualifier.readonly) if (qualifier.readonly)

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

@ -35,6 +35,7 @@ spv.memoryQualifier.frag
Decorate 19(i2D) DescriptorSet 0 Decorate 19(i2D) DescriptorSet 0
Decorate 19(i2D) Binding 1 Decorate 19(i2D) Binding 1
Decorate 19(i2D) Volatile Decorate 19(i2D) Volatile
Decorate 19(i2D) Coherent
Decorate 28(i2DRect) DescriptorSet 0 Decorate 28(i2DRect) DescriptorSet 0
Decorate 28(i2DRect) Binding 2 Decorate 28(i2DRect) Binding 2
Decorate 28(i2DRect) Restrict Decorate 28(i2DRect) Restrict
@ -48,6 +49,7 @@ spv.memoryQualifier.frag
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
MemberDecorate 50(Buffer) 0 Coherent
MemberDecorate 50(Buffer) 0 Offset 0 MemberDecorate 50(Buffer) 0 Offset 0
MemberDecorate 50(Buffer) 1 Coherent MemberDecorate 50(Buffer) 1 Coherent
MemberDecorate 50(Buffer) 1 Restrict MemberDecorate 50(Buffer) 1 Restrict

2
glslang/Include/revision.h
View File

@ -1,3 +1,3 @@
// This header is generated by the make-revision script. // This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2764 #define GLSLANG_PATCH_LEVEL 2765