diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2023-04-25 23:21:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 23:21:06 +0800 |
| commit | 58858297fd73602cfb7507ce23b0b9e3d9ded2be (patch) | |
| tree | 8f43deb6fcae4a953feb1b8d5d5f138717884ee1 /source/slang/slang-ir.cpp | |
| parent | 7b7c095b37e85ca3a8f55eff1c3d9643d467b8e0 (diff) | |
Bump glm and stb + small neatenings (#2831)
* bump glm to fix c++20 warnings
* bump stb_image to fix c++20 warnings
* Use static_assert for SLANG_COMPILE_TIME_ASSERT
* Remove uses of deprecated is_pod
* Remove bit operations between different enums
Diffstat (limited to 'source/slang/slang-ir.cpp')
| -rw-r--r-- | source/slang/slang-ir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp index 185f31b30..ae830ca4f 100644 --- a/source/slang/slang-ir.cpp +++ b/source/slang/slang-ir.cpp @@ -96,7 +96,7 @@ namespace Slang IROpInfo getIROpInfo(IROp opIn) { - const int op = opIn & kIROpMeta_OpMask; + const int op = opIn & kIROpMask_OpMask; if (op < kIROpCount) { // It's a main op @@ -6563,8 +6563,8 @@ namespace Slang return false; } - const IROp opA = IROp(a->getOp() & kIROpMeta_OpMask); - const IROp opB = IROp(b->getOp() & kIROpMeta_OpMask); + const IROp opA = IROp(a->getOp() & kIROpMask_OpMask); + const IROp opB = IROp(b->getOp() & kIROpMask_OpMask); if (opA != opB) { |