mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mismatched integer comparison (size_t/unsigned int vs int)

Browse Source
This commit is contained in:
baldurk 2019-01-30 17:29:17 +00:00
parent c9e03360e2
commit 332b173c82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SPIRV/SpvPostProcess.cpp
View File

@ -222,7 +222,7 @@ void Builder::postProcess(Instruction& inst)
Instruction *idx = module.getInstruction(accessChain->getIdOperand(i)); Instruction *idx = module.getInstruction(accessChain->getIdOperand(i));
if (type->getOpCode() == OpTypeStruct) { if (type->getOpCode() == OpTypeStruct) {
assert(idx->getOpCode() == OpConstant); assert(idx->getOpCode() == OpConstant);
int c = idx->getImmediateOperand(0); unsigned int c = idx->getImmediateOperand(0);
const auto function = [&](const std::unique_ptr<Instruction>& decoration) { const auto function = [&](const std::unique_ptr<Instruction>& decoration) {
if (decoration.get()->getOpCode() == OpMemberDecorate && if (decoration.get()->getOpCode() == OpMemberDecorate &&

2
glslang/MachineIndependent/SymbolTable.cpp
View File

@ -297,7 +297,7 @@ TVariable::TVariable(const TVariable& copyOf) : TSymbol(copyOf)
if (copyOf.getNumExtensions() > 0) if (copyOf.getNumExtensions() > 0)
setExtensions(copyOf.getNumExtensions(), copyOf.getExtensions()); setExtensions(copyOf.getNumExtensions(), copyOf.getExtensions());
if (copyOf.hasMemberExtensions()) { 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) if (copyOf.getNumMemberExtensions(m) > 0)
setMemberExtensions(m, copyOf.getNumMemberExtensions(m), copyOf.getMemberExtensions(m)); setMemberExtensions(m, copyOf.getNumMemberExtensions(m), copyOf.getMemberExtensions(m));
} }