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

Fix warning in iomapper. (#2449)

Browse Source 
ATT.
This commit is contained in:
Chow 2020-11-06 01:33:45 +08:00 committed by GitHub
parent 8c1a3a06b8
commit 3d7984dd1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glslang/MachineIndependent/iomapper.cpp
View File

@ -371,13 +371,13 @@ struct TSymbolValidater
} }
else if (overlapLocation >= 0) { else if (overlapLocation >= 0) {
if (diffLocation == true) { 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()); infoSink.info.message(EPrefixInternalError, err.c_str());
hadError = true; hadError = true;
break; break;
} }
else { 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()); infoSink.info.message(EPrefixInternalError, err.c_str());
hadError = true; hadError = true;
break; break;
@ -626,8 +626,8 @@ private:
const TQualifier& qualifier1 = type1->getQualifier(); const TQualifier& qualifier1 = type1->getQualifier();
const TQualifier& qualifier2 = type2->getQualifier(); const TQualifier& qualifier2 = type2->getQualifier();
if (isBlock == false && if (((isBlock == false) &&
(type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform) || (type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform)) ||
(type1->getQualifier().storage == EvqGlobal && type2->getQualifier().storage == EvqGlobal)) { (type1->getQualifier().storage == EvqGlobal && type2->getQualifier().storage == EvqGlobal)) {
if (qualifier1.precision != qualifier2.precision) { if (qualifier1.precision != qualifier2.precision) {
hasError = true; hasError = true;