From 58858297fd73602cfb7507ce23b0b9e3d9ded2be Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 25 Apr 2023 23:21:06 +0800 Subject: 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 --- source/slang/slang-ir.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-ir.cpp') 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) { -- cgit v1.2.3