diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp index cdfb309b..d30432e5 100755 --- a/SPIRV/GlslangToSpv.cpp +++ b/SPIRV/GlslangToSpv.cpp @@ -2777,7 +2777,7 @@ void TGlslangToSpvTraverser::makeFunctions(const glslang::TIntermSequence& glslF if (paramType.containsOpaque() || // sampler, etc. (paramType.getBasicType() == glslang::EbtBlock && paramType.getQualifier().storage == glslang::EvqBuffer) || // SSBO - p == 0 && implicitThis) // implicit 'this' + (p == 0 && implicitThis)) // implicit 'this' typeId = builder.makePointer(TranslateStorageClass(paramType), typeId); else if (paramType.getQualifier().storage != glslang::EvqConstReadOnly) typeId = builder.makePointer(spv::StorageClassFunction, typeId); diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index d4429094..aba195a5 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -3,4 +3,4 @@ // For the date, it uses the current date (when then script is run). #define GLSLANG_REVISION "Overload400-PrecQual.1937" -#define GLSLANG_DATE "24-Mar-2017" +#define GLSLANG_DATE "28-Mar-2017" diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp index 78f459a9..a6fe9bdf 100644 --- a/glslang/MachineIndependent/ParseHelper.cpp +++ b/glslang/MachineIndependent/ParseHelper.cpp @@ -5770,7 +5770,7 @@ void TParseContext::blockStageIoCheck(const TSourceLoc& loc, const TQualifier& q } // Do all block-declaration checking regarding its qualifiers. -void TParseContext::blockQualifierCheck(const TSourceLoc& loc, const TQualifier& qualifier, bool instanceName) +void TParseContext::blockQualifierCheck(const TSourceLoc& loc, const TQualifier& qualifier, bool /*instanceName*/) { // The 4.5 specification says: // diff --git a/glslang/MachineIndependent/ParseHelper.h b/glslang/MachineIndependent/ParseHelper.h index 61db6fe6..6d4fd341 100644 --- a/glslang/MachineIndependent/ParseHelper.h +++ b/glslang/MachineIndependent/ParseHelper.h @@ -174,7 +174,7 @@ protected: int firstNewMember; // the index of the first member not yet inserted into the symbol table // override this to set the language-specific name virtual const char* getGlobalUniformBlockName() const { return ""; } - virtual void setUniformBlockDefaults(TType& block) const { } + virtual void setUniformBlockDefaults(TType&) const { } virtual void finalizeGlobalUniformBlockLayout(TVariable&) { } virtual void outputMessage(const TSourceLoc&, const char* szReason, const char* szToken, const char* szExtraInfoFormat, TPrefixType prefix, diff --git a/glslang/MachineIndependent/iomapper.cpp b/glslang/MachineIndependent/iomapper.cpp index bebf775d..9a6613e2 100644 --- a/glslang/MachineIndependent/iomapper.cpp +++ b/glslang/MachineIndependent/iomapper.cpp @@ -445,19 +445,19 @@ struct TDefaultIoResolver : public glslang::TIoMapResolver return 0; } - bool validateInOut(EShLanguage stage, const char* name, const TType& type, bool is_live) override + bool validateInOut(EShLanguage /*stage*/, const char* /*name*/, const TType& /*type*/, bool /*is_live*/) override { return true; } - int resolveInOutLocation(EShLanguage stage, const char* name, const TType& type, bool is_live) override + int resolveInOutLocation(EShLanguage /*stage*/, const char* /*name*/, const TType& /*type*/, bool /*is_live*/) override { return -1; } - int resolveInOutComponent(EShLanguage stage, const char* name, const TType& type, bool is_live) override + int resolveInOutComponent(EShLanguage /*stage*/, const char* /*name*/, const TType& /*type*/, bool /*is_live*/) override { return -1; } - int resolveInOutIndex(EShLanguage stage, const char* name, const TType& type, bool is_live) override + int resolveInOutIndex(EShLanguage /*stage*/, const char* /*name*/, const TType& /*type*/, bool /*is_live*/) override { return -1; } diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index 4f6f8030..3ef3e9d5 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -1829,7 +1829,7 @@ bool HlslGrammar::acceptStruct(TType& type, TIntermNode*& nodeList) TVector functionDeclarators; parseContext.pushNamespace(structName); - bool acceptedList = acceptStructDeclarationList(typeList, nodeList, structName, functionDeclarators); + bool acceptedList = acceptStructDeclarationList(typeList, nodeList, functionDeclarators); parseContext.popNamespace(); if (! acceptedList) { @@ -1988,7 +1988,7 @@ bool HlslGrammar::acceptStructBufferType(TType& type) // | IDENTIFIER array_specifier post_decls // | IDENTIFIER function_parameters post_decls // member-function prototype // -bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*& nodeList, const TString& typeName, +bool HlslGrammar::acceptStructDeclarationList(TTypeList*& typeList, TIntermNode*& nodeList, TVector& declarators) { typeList = new TTypeList(); diff --git a/hlsl/hlslGrammar.h b/hlsl/hlslGrammar.h index 1a3abf10..38b2b584 100755 --- a/hlsl/hlslGrammar.h +++ b/hlsl/hlslGrammar.h @@ -87,8 +87,7 @@ namespace glslang { bool acceptTextureType(TType&); bool acceptStructBufferType(TType&); bool acceptStruct(TType&, TIntermNode*& nodeList); - bool acceptStructDeclarationList(TTypeList*&, TIntermNode*& nodeList, const TString& typeName, - TVector&); + bool acceptStructDeclarationList(TTypeList*&, TIntermNode*& nodeList, TVector&); bool acceptMemberFunctionDefinition(TIntermNode*& nodeList, const TType&, const TString& memberName, TFunctionDeclarator&); bool acceptFunctionParameters(TFunction&);