From 332b173c8265d1c206a15eedd23dab31caa22b8a Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 30 Jan 2019 17:29:17 +0000 Subject: [PATCH] Fix mismatched integer comparison (size_t/unsigned int vs int) --- SPIRV/SpvPostProcess.cpp | 2 +- glslang/MachineIndependent/SymbolTable.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SPIRV/SpvPostProcess.cpp b/SPIRV/SpvPostProcess.cpp index 04d594c..d4924f6 100755 --- a/SPIRV/SpvPostProcess.cpp +++ b/SPIRV/SpvPostProcess.cpp @@ -222,7 +222,7 @@ void Builder::postProcess(Instruction& inst) Instruction *idx = module.getInstruction(accessChain->getIdOperand(i)); if (type->getOpCode() == OpTypeStruct) { assert(idx->getOpCode() == OpConstant); - int c = idx->getImmediateOperand(0); + unsigned int c = idx->getImmediateOperand(0); const auto function = [&](const std::unique_ptr& decoration) { if (decoration.get()->getOpCode() == OpMemberDecorate && diff --git a/glslang/MachineIndependent/SymbolTable.cpp b/glslang/MachineIndependent/SymbolTable.cpp index 427666a..d8d6846 100755 --- a/glslang/MachineIndependent/SymbolTable.cpp +++ b/glslang/MachineIndependent/SymbolTable.cpp @@ -297,7 +297,7 @@ TVariable::TVariable(const TVariable& copyOf) : TSymbol(copyOf) if (copyOf.getNumExtensions() > 0) setExtensions(copyOf.getNumExtensions(), copyOf.getExtensions()); if (copyOf.hasMemberExtensions()) { - for (int m = 0; m < copyOf.type.getStruct()->size(); ++m) { + for (int m = 0; m < (int)copyOf.type.getStruct()->size(); ++m) { if (copyOf.getNumMemberExtensions(m) > 0) setMemberExtensions(m, copyOf.getNumMemberExtensions(m), copyOf.getMemberExtensions(m)); } -- 2.7.4