From 8ce6e2ba4907c5d062241947bb0300034ea23985 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sun, 27 Nov 2016 23:00:14 -0700 Subject: [PATCH] Fix non-Windows build error. --- glslang/Include/revision.h | 2 +- hlsl/hlslParseHelper.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 480953e0..5445009c 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -2,5 +2,5 @@ // For the version, it uses the latest git tag followed by the number of commits. // For the date, it uses the current date (when then script is run). -#define GLSLANG_REVISION "Overload400-PrecQual.1666" +#define GLSLANG_REVISION "Overload400-PrecQual.1667" #define GLSLANG_DATE "27-Nov-2016" diff --git a/hlsl/hlslParseHelper.h b/hlsl/hlslParseHelper.h index 02e69814..246c7c49 100755 --- a/hlsl/hlslParseHelper.h +++ b/hlsl/hlslParseHelper.h @@ -172,7 +172,7 @@ protected: void declareArray(const TSourceLoc&, TString& identifier, const TType&, TSymbol*&, bool track); TIntermNode* executeInitializer(const TSourceLoc&, TIntermTyped* initializer, TVariable* variable); TIntermTyped* convertInitializerList(const TSourceLoc&, const TType&, TIntermTyped* initializer); - bool HlslParseContext::isZeroConstructor(const TIntermNode*); + bool isZeroConstructor(const TIntermNode*); TOperator mapAtomicOp(const TSourceLoc& loc, TOperator op, bool isImage); // Return true if this node requires L-value conversion (e.g, to an imageStore).