archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 16:31:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use atomic_t<> in VKMemAlloc

Browse source
This commit is contained in:
Nekotekina 2020-12-10 18:44:17 +03:00
parent 65c04e4ddd
commit 72284b4530
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rpcs3/Emu/RSX/VK/VKHelpers.h
View file

@ -22,8 +22,16 @@
#include "../display.h" #include "../display.h"
#include "../rsx_utils.h" #include "../rsx_utils.h"
#define VMA_ATOMIC_UINT32 atomic_t<u32>
#define VMA_ATOMIC_UINT64 atomic_t<u64>
#define compare_exchange_strong compare_exchange
#define compare_exchange_weak compare_exchange
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" #include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
#undef compare_exchange_strong
#undef compare_exchange_weak
#ifdef __APPLE__ #ifdef __APPLE__
#define VK_DISABLE_COMPONENT_SWIZZLE 1 #define VK_DISABLE_COMPONENT_SWIZZLE 1
#else #else

7
rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
View file

@ -1,5 +1,12 @@
#define VMA_IMPLEMENTATION #define VMA_IMPLEMENTATION
#include "util/atomic.hpp"
#define VMA_ATOMIC_UINT32 atomic_t<u32>
#define VMA_ATOMIC_UINT64 atomic_t<u64>
#define compare_exchange_strong compare_exchange
#define compare_exchange_weak compare_exchange
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(push, 0) #pragma warning(push, 0)
#else #else