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

Merge pull request #1685 from baldurk/warning-fix

Browse Source 
Fix a couple of warnings clang found
This commit is contained in:
John Kessenich 2019-01-31 22:44:19 -08:00 committed by GitHub
commit 1694883215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 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));
} }

10
glslang/MachineIndependent/SymbolTable.h
View File

@ -345,20 +345,20 @@ protected:
class TAnonMember : public TSymbol { class TAnonMember : public TSymbol {
public: public:
TAnonMember(const TString* n, unsigned int m, TVariable& a, int an) : TSymbol(n), anonContainer(a), memberNumber(m), anonId(an) { } TAnonMember(const TString* n, unsigned int m, TVariable& a, int an) : TSymbol(n), anonContainer(a), memberNumber(m), anonId(an) { }
virtual TAnonMember* clone() const; virtual TAnonMember* clone() const override;
virtual ~TAnonMember() { } virtual ~TAnonMember() { }
virtual const TAnonMember* getAsAnonMember() const { return this; } virtual const TAnonMember* getAsAnonMember() const override { return this; }
virtual const TVariable& getAnonContainer() const { return anonContainer; } virtual const TVariable& getAnonContainer() const { return anonContainer; }
virtual unsigned int getMemberNumber() const { return memberNumber; } virtual unsigned int getMemberNumber() const { return memberNumber; }
virtual const TType& getType() const virtual const TType& getType() const override
{ {
const TTypeList& types = *anonContainer.getType().getStruct(); const TTypeList& types = *anonContainer.getType().getStruct();
return *types[memberNumber].type; return *types[memberNumber].type;
} }
virtual TType& getWritableType() virtual TType& getWritableType() override
{ {
assert(writable); assert(writable);
const TTypeList& types = *anonContainer.getType().getStruct(); const TTypeList& types = *anonContainer.getType().getStruct();
@ -373,7 +373,7 @@ public:
virtual const char** getExtensions() const override { return anonContainer.getMemberExtensions(memberNumber); } virtual const char** getExtensions() const override { return anonContainer.getMemberExtensions(memberNumber); }
virtual int getAnonId() const { return anonId; } virtual int getAnonId() const { return anonId; }
virtual void dump(TInfoSink &infoSink) const; virtual void dump(TInfoSink &infoSink) const override;
protected: protected:
explicit TAnonMember(const TAnonMember&); explicit TAnonMember(const TAnonMember&);