diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp index 9dc71f11c..0a6fa7a02 100644 --- a/src/dxbc/dxbc_compiler.cpp +++ b/src/dxbc/dxbc_compiler.cpp @@ -2061,24 +2061,28 @@ namespace dxvk { break; case DxbcOpcode::AtomicIMin: + case DxbcOpcode::ImmAtomicIMin: value.id = m_module.opAtomicSMin(typeId, pointer.id, scopeId, semanticsId, src[0].id); break; case DxbcOpcode::AtomicIMax: + case DxbcOpcode::ImmAtomicIMax: value.id = m_module.opAtomicSMax(typeId, pointer.id, scopeId, semanticsId, src[0].id); break; case DxbcOpcode::AtomicUMin: + case DxbcOpcode::ImmAtomicUMin: value.id = m_module.opAtomicUMin(typeId, pointer.id, scopeId, semanticsId, src[0].id); break; case DxbcOpcode::AtomicUMax: + case DxbcOpcode::ImmAtomicUMax: value.id = m_module.opAtomicUMax(typeId, pointer.id, scopeId, semanticsId, src[0].id); diff --git a/src/dxbc/dxbc_defs.cpp b/src/dxbc/dxbc_defs.cpp index 3e1ed31b2..c87c5ad06 100644 --- a/src/dxbc/dxbc_defs.cpp +++ b/src/dxbc/dxbc_defs.cpp @@ -927,28 +927,28 @@ namespace dxvk { { DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 }, } }, - /* ImmAtomicImax */ + /* ImmAtomicIMax */ { 4, DxbcInstClass::Atomic, { { DxbcOperandKind::DstReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::DstReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Sint32 }, } }, - /* ImmAtomicImin */ + /* ImmAtomicIMin */ { 4, DxbcInstClass::Atomic, { { DxbcOperandKind::DstReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::DstReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Sint32 }, } }, - /* ImmAtomicUmax */ + /* ImmAtomicUMax */ { 4, DxbcInstClass::Atomic, { { DxbcOperandKind::DstReg, DxbcScalarType::Uint32 }, { DxbcOperandKind::DstReg, DxbcScalarType::Uint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Sint32 }, { DxbcOperandKind::SrcReg, DxbcScalarType::Uint32 }, } }, - /* ImmAtomicUmin */ + /* ImmAtomicUMin */ { 4, DxbcInstClass::Atomic, { { DxbcOperandKind::DstReg, DxbcScalarType::Uint32 }, { DxbcOperandKind::DstReg, DxbcScalarType::Uint32 }, diff --git a/src/dxbc/dxbc_enums.h b/src/dxbc/dxbc_enums.h index a02523ffc..1d7866c94 100644 --- a/src/dxbc/dxbc_enums.h +++ b/src/dxbc/dxbc_enums.h @@ -194,10 +194,10 @@ namespace dxvk { ImmAtomicXor = 183, ImmAtomicExch = 184, ImmAtomicCmpExch = 185, - ImmAtomicImax = 186, - ImmAtomicImin = 187, - ImmAtomicUmax = 188, - ImmAtomicUmin = 189, + ImmAtomicIMax = 186, + ImmAtomicIMin = 187, + ImmAtomicUMax = 188, + ImmAtomicUMin = 189, Sync = 190, DAdd = 191, DMax = 192, diff --git a/src/dxbc/dxbc_names.cpp b/src/dxbc/dxbc_names.cpp index 059efb175..0b43730e2 100644 --- a/src/dxbc/dxbc_names.cpp +++ b/src/dxbc/dxbc_names.cpp @@ -190,10 +190,10 @@ std::ostream& operator << (std::ostream& os, DxbcOpcode e) { ENUM_NAME(DxbcOpcode::ImmAtomicXor); ENUM_NAME(DxbcOpcode::ImmAtomicExch); ENUM_NAME(DxbcOpcode::ImmAtomicCmpExch); - ENUM_NAME(DxbcOpcode::ImmAtomicImax); - ENUM_NAME(DxbcOpcode::ImmAtomicImin); - ENUM_NAME(DxbcOpcode::ImmAtomicUmax); - ENUM_NAME(DxbcOpcode::ImmAtomicUmin); + ENUM_NAME(DxbcOpcode::ImmAtomicIMax); + ENUM_NAME(DxbcOpcode::ImmAtomicIMin); + ENUM_NAME(DxbcOpcode::ImmAtomicUMax); + ENUM_NAME(DxbcOpcode::ImmAtomicUMin); ENUM_NAME(DxbcOpcode::Sync); ENUM_NAME(DxbcOpcode::DAdd); ENUM_NAME(DxbcOpcode::DMax);