From e474c4e3aadc22a1b9f9b006104409f10936244f Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Tue, 16 Feb 2021 11:48:21 -0800 Subject: Add an accessor for IRInst opcode (#1707) * Add an accessor for IRInst opcode This main changing is renaming `IRInst::op` over to `IRInst::m_op` and then adds an accessor `IRInst::getOp()` to read it. The rest of the changes are just changing use sites to `getOp` (or to `m_op` in the limited cases where we write to it). This work is in anticipation of a future change that might need to store an extra bit in the same field as the opcode. It seemed better to do this massive refactoring as a separate PR. * fixup --- source/slang/slang-intrinsic-expand.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/slang/slang-intrinsic-expand.cpp') diff --git a/source/slang/slang-intrinsic-expand.cpp b/source/slang/slang-intrinsic-expand.cpp index ca52dd5f0..c6cf65e5a 100644 --- a/source/slang/slang-intrinsic-expand.cpp +++ b/source/slang/slang-intrinsic-expand.cpp @@ -192,7 +192,7 @@ const char* IntrinsicExpandContext::_emitSpecial(const char* cursor) } // We only need to output a cast if the underlying type is half. - if (underlyingType && underlyingType->op == kIROp_HalfType) + if (underlyingType && underlyingType->getOp() == kIROp_HalfType) { m_emitter->emitSimpleType(elementType); m_writer->emit("("); @@ -332,7 +332,7 @@ const char* IntrinsicExpandContext::_emitSpecial(const char* cursor) SLANG_RELEASE_ASSERT(m_argCount > argIndex); auto arg = m_args[argIndex].get(); - if (arg->op == kIROp_ImageSubscript) + if (arg->getOp() == kIROp_ImageSubscript) { m_writer->emit("imageA"); } @@ -357,7 +357,7 @@ const char* IntrinsicExpandContext::_emitSpecial(const char* cursor) SLANG_RELEASE_ASSERT(m_argCount > argIndex); auto arg = m_args[argIndex].get(); - if (arg->op == kIROp_ImageSubscript) + if (arg->getOp() == kIROp_ImageSubscript) { if (m_emitter->getSourceLanguage() == SourceLanguage::GLSL) { @@ -389,7 +389,7 @@ const char* IntrinsicExpandContext::_emitSpecial(const char* cursor) elementCount = getIntVal(coordsVecType->getElementCount()); } - SLANG_ASSERT(coordsType->op == kIROp_UIntType); + SLANG_ASSERT(coordsType->getOp() == kIROp_UIntType); if (elementCount > 1) { @@ -479,7 +479,7 @@ const char* IntrinsicExpandContext::_emitSpecial(const char* cursor) auto argType = arg->getDataType(); const char* str = ""; - switch (argType->op) + switch (argType->getOp()) { #define CASE(OP, STR) \ case kIROp_##OP: str = #STR; break -- cgit v1.2.3