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

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
Родитель d6c975572e
Коммит 14b85d3ff3
3 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

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