diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 5ab3596bffc90ed5c17b858ea2ce5725f367d3b2..47da680b80913971414baaeae94123c1f33662e0 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 37c8635c98346b7dc9358ce2267126607faedcc7..be148eb3fec74ccd2e747c30e72dcb87ac838ec4 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;