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

HLSL: Report failed assignments; some were silently not happening.

Browse Source 
Starting out with this turned off, so tests can be locally fixed,
then will turn it on.
This commit is contained in:
John Kessenich 2016-07-27 10:24:31 -06:00
parent 879a16581f
commit b783d712ab
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // 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). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.1340" #define GLSLANG_REVISION "SPIRV99.1348"
#define GLSLANG_DATE "26-Jul-2016" #define GLSLANG_DATE "27-Jul-2016"

3
hlsl/hlslGrammar.cpp
View File

@ -1585,6 +1585,9 @@ bool HlslGrammar::acceptAssignmentExpression(TIntermTyped*& node)
} }
node = intermediate.addAssign(assignOp, node, rightNode, loc); 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)) if (! peekTokenClass(EHTokComma))
return true; return true;