diff --git a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
index 91f1f01c3..c7984a9f8 100644
--- a/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
+++ b/renderdoc/3rdparty/glslang/SPIRV/GlslangToSpv.cpp
@@ -5310,7 +5310,7 @@ spv::Id TGlslangToSpvTraverser::makeArraySizeId(const glslang::TArraySizes& arra
         assert(size > 0);
 
     if (boolType) {
-        return builder.makeBoolConstant(size);
+        return builder.makeBoolConstant(size ? true : false);
     } else {
         return builder.makeUintConstant(size);
     }
diff --git a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
index f7895d979..5e8dd4571 100644
--- a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
+++ b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/ParseContextBase.cpp
@@ -59,7 +59,7 @@ void TParseContextBase::outputMessage(const TSourceLoc& loc, const char* szReaso
     safe_vsprintf(szExtraInfo, maxSize, szExtraInfoFormat, args);
 
     infoSink.info.prefix(prefix);
-    infoSink.info.location(loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+    infoSink.info.location(loc, (messages & EShMsgAbsolutePath) != 0, (messages & EShMsgDisplayErrorColumn) != 0);
     infoSink.info << "'" << szToken <<  "' : " << szReason << " " << szExtraInfo << "\n";
 
     if (prefix == EPrefixError) {
diff --git a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Versions.cpp b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Versions.cpp
index cbfae6c72..66405a889 100644
--- a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Versions.cpp
+++ b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Versions.cpp
@@ -778,7 +778,7 @@ void TParseVersions::profileRequires(const TSourceLoc& loc, int profileMask, int
         for (int i = 0; i < numExtensions; ++i) {
             switch (getExtensionBehavior(extensions[i])) {
             case EBhWarn:
-                infoSink.info.message(EPrefixWarning, ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(), loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                infoSink.info.message(EPrefixWarning, ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(), loc, (messages & EShMsgAbsolutePath) != 0, (messages & EShMsgDisplayErrorColumn) != 0);
                 [[fallthrough]];
             case EBhRequire:
             case EBhEnable:
@@ -817,7 +817,7 @@ void TParseVersions::checkDeprecated(const TSourceLoc& loc, int profileMask, int
             else if (! suppressWarnings())
                 infoSink.info.message(EPrefixWarning, (TString(featureDesc) + " deprecated in version " +
                                                        String(depVersion) + "; may be removed in future release").c_str(), 
-                                                       loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                                                       loc, (messages & EShMsgAbsolutePath) != 0, (messages & EShMsgDisplayErrorColumn) != 0);
         }
     }
 }
@@ -855,13 +855,13 @@ bool TParseVersions::checkExtensionsRequested(const TSourceLoc& loc, int numExte
         TExtensionBehavior behavior = getExtensionBehavior(extensions[i]);
         if (behavior == EBhDisable && relaxedErrors()) {
             infoSink.info.message(EPrefixWarning, "The following extension must be enabled to use this feature:", loc,
-                                  messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                                  (messages & EShMsgAbsolutePath) != 0, (messages & EShMsgDisplayErrorColumn) != 0);
             behavior = EBhWarn;
         }
         if (behavior == EBhWarn) {
             infoSink.info.message(EPrefixWarning,
                                   ("extension " + TString(extensions[i]) + " is being used for " + featureDesc).c_str(),
-                                  loc, messages & EShMsgAbsolutePath, messages & EShMsgDisplayErrorColumn);
+                                  loc, (messages & EShMsgAbsolutePath) != 0, (messages & EShMsgDisplayErrorColumn) != 0);
             warned = true;
         }
     }