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
This commit is contained in:
John Kessenich 2013-07-01 04:54:28 +00:00
parent 69c3d8c1a0
commit 6c0928d924

View File

@ -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;
}