From a06bd527ca0e21e401f36b6062481bf76f5b067b Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 11 Sep 2015 15:15:23 -0600 Subject: [PATCH] SPV: Correct generation of transparent offsets for implicitly assigned offsets. --- SPIRV/GlslangToSpv.cpp | 2 +- glslang/Include/revision.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index 302db80a..cc027383 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -1426,7 +1426,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangToSpvType(const glslang::TType& ty int nextOffset; updateMemberOffset(type, glslangType, offset, nextOffset); if (offset >= 0) - builder.addMemberDecoration(spvType, member, spv::DecorationOffset, glslangType.getQualifier().layoutOffset); + builder.addMemberDecoration(spvType, member, spv::DecorationOffset, offset); offset = nextOffset; } diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index f9349893..37a027a4 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "3.0.746" -#define GLSLANG_DATE "09-Sep-2015" +#define GLSLANG_REVISION "3.0.747" +#define GLSLANG_DATE "11-Sep-2015"