From 3cb57d373151f775733565639499be35fd04eb0a Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 9 Apr 2016 13:07:12 +0200 Subject: [PATCH 1/2] Fix warning about losing information, use size_t instead of int --- SPIRV/GlslangToSpv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index 8dfc681d..92495746 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -2125,7 +2125,7 @@ void TGlslangToSpvTraverser::updateMemberOffset(const glslang::TType& /*structTy bool TGlslangToSpvTraverser::isShaderEntrypoint(const glslang::TIntermAggregate* node) { // have to ignore mangling and just look at the base name - int firstOpen = node->getName().find('('); + size_t firstOpen = node->getName().find('('); return node->getName().compare(0, firstOpen, glslangIntermediate->getEntryPoint().c_str()) == 0; } From 40289165dd8b41a441e8e2abd2ec790e987722da Mon Sep 17 00:00:00 2001 From: baldurk Date: Sat, 9 Apr 2016 13:07:25 +0200 Subject: [PATCH 2/2] Fix warning about function parameter shadowing class member variable --- glslang/Include/Types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glslang/Include/Types.h b/glslang/Include/Types.h index bff7e9a9..e28e5b29 100644 --- a/glslang/Include/Types.h +++ b/glslang/Include/Types.h @@ -999,9 +999,9 @@ public: qualifier.storage = EvqGlobal; } - void init(const TSourceLoc& loc, bool global = false) + void init(const TSourceLoc& l, bool global = false) { - initType(loc); + initType(l); sampler.clear(); initQualifiers(global); shaderQualifiers.init();