From 6c0928d9249c3e0ba18deb6a82de68f97f9e5af5 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Mon, 1 Jul 2013 04:54:28 +0000 Subject: [PATCH] Fix bug dropping some qualifiers when merging with block member default qualification. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22240 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- glslang/MachineIndependent/ParseHelper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 51696198..e675ff73 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -1632,7 +1632,7 @@ void TParseContext::addBlock(int line, TTypeList& typeList, const TString* insta mergeLayoutQualifiers(line, defaultQualification, currentBlockDefaults); for (unsigned int member = 0; member < typeList.size(); ++member) { TQualifier memberQualification = defaultQualification; - mergeLayoutQualifiers(line, memberQualification, typeList[member].type->getQualifier()); + mergeQualifiers(line, memberQualification, typeList[member].type->getQualifier(), false); typeList[member].type->getQualifier() = memberQualification; }