lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add temporary glslang warning fixes

Browse Source
This commit is contained in:
baldurk
2016-06-28 19:10:04 +02:00
parent 2b80776d5c
commit 92d2fe0db9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/3rdparty/glslang/glslang/MachineIndependent/Scan.h
Vendored
+1 -1
View File
@@ -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;
renderdoc/3rdparty/glslang/hlsl/hlslParseables.cpp
Vendored
+4 -4
View File
@@ -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" ||