From 92d2fe0db9d62e9e2825bd3c0819e1252e3e2329 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 28 Jun 2016 19:10:04 +0200 Subject: [PATCH] Add temporary glslang warning fixes --- .../3rdparty/glslang/glslang/MachineIndependent/Scan.h | 2 +- renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Scan.h b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Scan.h index 1cc437cb4..6e4910c64 100644 --- a/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Scan.h +++ b/renderdoc/3rdparty/glslang/glslang/MachineIndependent/Scan.h @@ -175,7 +175,7 @@ public: void setFile(const char* filename, size_t i) { - if (i == getLastValidSourceIndex()) { + if ((int)i == getLastValidSourceIndex()) { logicalSourceLoc.name = filename; } loc[i].name = filename; diff --git a/renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp b/renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp index cf8574ca2..6ea9b6219 100644 --- a/renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp +++ b/renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp @@ -109,8 +109,8 @@ glslang::TString& AppendTypeName(glslang::TString& s, const char* argOrder, cons } // verify dimensions - if ((*argOrder == 'V' || *argOrder == 'M') && (dim0 < 1 || dim0 > 4) || - (*argOrder == 'M' && (dim1 < 1 || dim1 > 4))) { + if (((*argOrder == 'V' || *argOrder == 'M') && (dim0 < 1 || dim0 > 4)) || + ((*argOrder == 'M' && (dim1 < 1 || dim1 > 4)))) { s += "UNKNOWN_DIMENSION"; return s; } @@ -145,8 +145,8 @@ inline bool IsValidGlsl(const char* cname, char retOrder, char retType, char arg if (isMat && dim0 != dim1) // TODO: avoid mats until we find the right GLSL profile return false; - if (isMat && (argType == 'I' || argType == 'U' || argType == 'B') || - retOrder == 'M' && (retType == 'I' || retType == 'U' || retType == 'B')) + if ((isMat && (argType == 'I' || argType == 'U' || argType == 'B')) || + (retOrder == 'M' && (retType == 'I' || retType == 'U' || retType == 'B'))) return false; if (name == "GetRenderTargetSamplePosition" ||