diff options
Diffstat (limited to 'src/3rdparty/VulkanMemoryAllocator/patches/0001-Disable-SRWLOCK-for-MinGW.patch')
| -rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/patches/0001-Disable-SRWLOCK-for-MinGW.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0001-Disable-SRWLOCK-for-MinGW.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0001-Disable-SRWLOCK-for-MinGW.patch new file mode 100644 index 0000000000..8d5b50e7bc --- /dev/null +++ b/src/3rdparty/VulkanMemoryAllocator/patches/0001-Disable-SRWLOCK-for-MinGW.patch @@ -0,0 +1,26 @@ +From 1e4a10230381acc79768fd577987dde4255d6148 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Thu, 14 Jan 2021 11:22:09 +0100 +Subject: [PATCH 1/4] Disable SRWLOCK for MinGW + +Change-Id: Ie671e7bcf88ef28eb177a6fba17964a5e8ae30c0 +--- + src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +index 0dfb66efc6..8e579967d9 100644 +--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h ++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +@@ -3691,7 +3691,7 @@ void *aligned_alloc(size_t alignment, size_t size) + std::shared_mutex m_Mutex; + }; + #define VMA_RW_MUTEX VmaRWMutex +- #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600 ++ #elif defined(_WIN32) && defined(WINVER) && WINVER >= 0x0600 && !defined(__MINGW32__) + // Use SRWLOCK from WinAPI. + // Minimum supported client = Windows Vista, server = Windows Server 2008. + class VmaRWMutex +-- +2.23.0.windows.1 + |