From 3d7984dd1e602da17910db8b5dbe171abf510d7a Mon Sep 17 00:00:00 2001 From: Chow Date: Fri, 6 Nov 2020 01:33:45 +0800 Subject: [PATCH] Fix warning in iomapper. (#2449) ATT. --- glslang/MachineIndependent/iomapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glslang/MachineIndependent/iomapper.cpp b/glslang/MachineIndependent/iomapper.cpp index 0e9e717a..c42e74fa 100644 --- a/glslang/MachineIndependent/iomapper.cpp +++ b/glslang/MachineIndependent/iomapper.cpp @@ -371,13 +371,13 @@ struct TSymbolValidater } else if (overlapLocation >= 0) { if (diffLocation == true) { - TString err = "Uniform location should be equal for same uniforms: " + overlapLocation; + TString err = ("Uniform location should be equal for same uniforms: " +std::to_string(overlapLocation)).c_str(); infoSink.info.message(EPrefixInternalError, err.c_str()); hadError = true; break; } else { - TString err = "Uniform location overlaps across stages: " + overlapLocation; + TString err = ("Uniform location overlaps across stages: " + std::to_string(overlapLocation)).c_str(); infoSink.info.message(EPrefixInternalError, err.c_str()); hadError = true; break; @@ -626,8 +626,8 @@ private: const TQualifier& qualifier1 = type1->getQualifier(); const TQualifier& qualifier2 = type2->getQualifier(); - if (isBlock == false && - (type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform) || + if (((isBlock == false) && + (type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform)) || (type1->getQualifier().storage == EvqGlobal && type2->getQualifier().storage == EvqGlobal)) { if (qualifier1.precision != qualifier2.precision) { hasError = true;