diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index dbbc22cb5b..7baf5698d5 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -22,8 +22,16 @@ #include "../display.h" #include "../rsx_utils.h" +#define VMA_ATOMIC_UINT32 atomic_t +#define VMA_ATOMIC_UINT64 atomic_t +#define compare_exchange_strong compare_exchange +#define compare_exchange_weak compare_exchange + #include "3rdparty/GPUOpen/include/vk_mem_alloc.h" +#undef compare_exchange_strong +#undef compare_exchange_weak + #ifdef __APPLE__ #define VK_DISABLE_COMPONENT_SWIZZLE 1 #else diff --git a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp index 78369868dc..9c82751ef3 100644 --- a/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp +++ b/rpcs3/Emu/RSX/VK/VKMemAlloc.cpp @@ -1,5 +1,12 @@ #define VMA_IMPLEMENTATION +#include "util/atomic.hpp" + +#define VMA_ATOMIC_UINT32 atomic_t +#define VMA_ATOMIC_UINT64 atomic_t +#define compare_exchange_strong compare_exchange +#define compare_exchange_weak compare_exchange + #ifdef _MSC_VER #pragma warning(push, 0) #else