From b783d712abd5d1a493e1f93a385539992f4bba9e Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Wed, 27 Jul 2016 10:24:31 -0600 Subject: [PATCH] HLSL: Report failed assignments; some were silently not happening. Starting out with this turned off, so tests can be locally fixed, then will turn it on. --- glslang/Include/revision.h | 4 ++-- hlsl/hlslGrammar.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 5ab3596b..47da680b 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 "SPIRV99.1340" -#define GLSLANG_DATE "26-Jul-2016" +#define GLSLANG_REVISION "SPIRV99.1348" +#define GLSLANG_DATE "27-Jul-2016" diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp index 37c8635c..be148eb3 100755 --- a/hlsl/hlslGrammar.cpp +++ b/hlsl/hlslGrammar.cpp @@ -1585,6 +1585,9 @@ bool HlslGrammar::acceptAssignmentExpression(TIntermTyped*& node) } node = intermediate.addAssign(assignOp, node, rightNode, loc); + // TODO: Turn this on after tests are fixed for it: + //if (node == nullptr) + // parseContext.error(loc, "could not create assignment", "", ""); if (! peekTokenClass(EHTokComma)) return true;