From 885443c7886dd0c11b62fed315c9aead1f3d7bc2 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 7 Jun 2017 19:03:11 -0600 Subject: [PATCH] Build: reset for multi-threaded test error, that reported a single missing character. --- glslang/MachineIndependent/ParseHelper.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 4aa6f4e1..31a06860 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -4314,7 +4314,6 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi // This is also true for overriding layout-qualifier-names, where one // overrides the other (e.g., row_major vs. column_major); only the last // occurrence has any effect." -// void TParseContext::mergeObjectLayoutQualifiers(TQualifier& dst, const TQualifier& src, bool inheritOnly) { if (src.hasMatrix())