From 227e026dbf3b306ad018dc9467a539140734ada0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 10 Feb 2016 19:41:29 +0100 Subject: [PATCH 1/3] MSVC warning fix - conversion from size_t to int, possible loss of data --- SPIRV/SpvBuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPIRV/SpvBuilder.cpp b/SPIRV/SpvBuilder.cpp index bc405312..74ed611b 100644 --- a/SPIRV/SpvBuilder.cpp +++ b/SPIRV/SpvBuilder.cpp @@ -2121,7 +2121,7 @@ Id Builder::accessChainGetInferredType() if (accessChain.swizzle.size() == 1) type = getContainedTypeId(type); else if (accessChain.swizzle.size() > 1) - type = makeVectorType(getContainedTypeId(type), accessChain.swizzle.size()); + type = makeVectorType(getContainedTypeId(type), (int)accessChain.swizzle.size()); // dereference component selection if (accessChain.component) From 9cc6cd3ef4de7cbe9d04d6690e93379e0aeddbbb Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 10 Feb 2016 20:04:20 +0100 Subject: [PATCH 2/3] GCC warning fix - unhandled enums in switch statement --- SPIRV/GlslangToSpv.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index 21a04b0e..eeb40598 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -351,6 +351,8 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI case EShLangTessEvaluation: builder.addCapability(spv::CapabilityTessellationPointSize); break; + default: + break; } return spv::BuiltInPointSize; From 1be2ffa7cd7bf9409d8a4be79e600aae2d68b1e0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 25 Feb 2016 21:47:14 +0100 Subject: [PATCH 3/3] GCC/Clang warning fix - unsigned/signed mismatch in comparison --- glslang/MachineIndependent/localintermediate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glslang/MachineIndependent/localintermediate.h b/glslang/MachineIndependent/localintermediate.h index 00908b0b..60bf68ed 100644 --- a/glslang/MachineIndependent/localintermediate.h +++ b/glslang/MachineIndependent/localintermediate.h @@ -267,7 +267,7 @@ public: localSizeSpecId[dim] = id; return true; } - unsigned int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; } + int getLocalSizeSpecId(int dim) const { return localSizeSpecId[dim]; } void setXfbMode() { xfbMode = true; } bool getXfbMode() const { return xfbMode; }