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-serialize-ir.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/slang/slang-serialize-ir.cpp') diff --git a/source/slang/slang-serialize-ir.cpp b/source/slang/slang-serialize-ir.cpp index d87fc38e2..2da923c43 100644 --- a/source/slang/slang-serialize-ir.cpp +++ b/source/slang/slang-serialize-ir.cpp @@ -12,13 +12,13 @@ namespace Slang { static bool _isTextureTypeBase(IROp opIn) { - const int op = (kIROpMeta_OpMask & opIn); + const int op = (kIROpMask_OpMask & opIn); return op >= kIROp_FirstTextureTypeBase && op <= kIROp_LastTextureTypeBase; } static bool _isConstant(IROp opIn) { - const int op = (kIROpMeta_OpMask & opIn); + const int op = (kIROpMask_OpMask & opIn); return op >= kIROp_FirstConstant && op <= kIROp_LastConstant; } @@ -190,7 +190,7 @@ Result IRSerialWriter::write(IRModule* module, SerialSourceLocWriter* sourceLocW IRInst* srcInst = m_insts[i]; Ser::Inst& dstInst = m_serialData->m_insts[i]; - dstInst.m_op = uint16_t(srcInst->getOp() & kIROpMeta_OpMask); + dstInst.m_op = uint16_t(srcInst->getOp() & kIROpMask_OpMask); dstInst.m_payloadType = PayloadType::Empty; dstInst.m_resultTypeIndex = getInstIndex(srcInst->getFullType()); -- cgit v1.2.3