From d72f488cc6c4927ebda8af55950650fa818b8f1d Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 16 Jan 2019 14:55:37 +0700 Subject: [PATCH] Build: fix warnings. Fixes #1653. --- SPIRV/GlslangToSpv.cpp | 2 +- glslang/MachineIndependent/ParseHelper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 SPIRV/GlslangToSpv.cpp diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp old mode 100644 new mode 100755 index c7cab84..9bf3704 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -3232,7 +3232,7 @@ spv::Id TGlslangToSpvTraverser::convertGlslangStructToSpvType(const glslang::TTy // Decorate it decorateStructType(type, glslangMembers, explicitLayout, qualifier, spvType); - for (int i = 0; i < deferredForwardPointers.size(); ++i) { + for (int i = 0; i < (int)deferredForwardPointers.size(); ++i) { auto it = deferredForwardPointers[i]; convertGlslangToSpvType(*it.first, explicitLayout, it.second, false); } diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index d16dc99..128fd7a 100755 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -5062,7 +5062,7 @@ void TParseContext::setLayoutQualifier(const TSourceLoc& loc, TPublicType& publi if (! IsPow2(value)) error(loc, "must be a power of 2", "buffer_reference_align", ""); else - publicType.qualifier.layoutBufferReferenceAlign = std::log2(value); + publicType.qualifier.layoutBufferReferenceAlign = (unsigned int)std::log2(value); return; } -- 2.7.4