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

Build: reset for multi-threaded test error, that reported a single missing character.

Browse Source
This commit is contained in:
John Kessenich 2017-06-07 19:03:11 -06:00
parent 14d65beb06
commit 885443c788
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -4314,7 +4314,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi
// This is also true for overriding layout-qualifier-names, where one // This is also true for overriding layout-qualifier-names, where one
// overrides the other (e.g., row_major vs. column_major); only the last // overrides the other (e.g., row_major vs. column_major); only the last
// occurrence has any effect." // occurrence has any effect."
//
void TParseContext::mergeObjectLayoutQualifiers(TQualifier& dst, const TQualifier& src, bool inheritOnly) void TParseContext::mergeObjectLayoutQualifiers(TQualifier& dst, const TQualifier& src, bool inheritOnly)
{ {
if (src.hasMatrix()) if (src.hasMatrix())