diff options
| author | Yong He <yonghe@outlook.com> | 2018-01-18 12:49:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 12:49:59 -0800 |
| commit | 2079b941bc5849b6ab33774fb90cefe9c2d624cb (patch) | |
| tree | 6bba14a93d90a251c4e2f75381ddf71ea9a3bbca /source/slang/slang-stdlib.cpp | |
| parent | 68f529af8d0eb8ec45a2d73e82c4ee372015ce01 (diff) | |
| parent | 9eb8b4e187e8b4fc5394668d476ada0512ae4ccc (diff) | |
Merge pull request #371 from csyonghe/master
All compiler fixes to get ir branch work with falcor feature demo.
Diffstat (limited to 'source/slang/slang-stdlib.cpp')
| -rw-r--r-- | source/slang/slang-stdlib.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp index 3e526e96c..bee823d69 100644 --- a/source/slang/slang-stdlib.cpp +++ b/source/slang/slang-stdlib.cpp @@ -199,7 +199,7 @@ namespace Slang { kIRPseudoOp_Pos, "+", ARITHMETIC_MASK }, { kIROp_Neg, "-", ARITHMETIC_MASK }, { kIROp_Not, "!", ANY_MASK }, - { kIRPseudoOp_BitNot, "~", INT_MASK }, + { kIROp_BitNot, "~", INT_MASK }, { kIRPseudoOp_PreInc, "++", ARITHMETIC_MASK | ASSIGNMENT }, { kIRPseudoOp_PreDec, "--", ARITHMETIC_MASK | ASSIGNMENT }, { kIRPseudoOp_PostInc, "++", ARITHMETIC_MASK | ASSIGNMENT | POSTFIX }, |
