From b17e05729e3404d2fe65f28a903a7a1b9f6cc115 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Tue, 18 Jun 2019 10:41:12 +0200 Subject: [PATCH] vkmemalloc: Disable SRWLOCK for mingw ...until some day someone investigates what is exactly the problem with the sdk that ships with mingw. Task-number: QTBUG-76424 Change-Id: I64869a4fbb07a64cfc1430234d732e143fefe720 Reviewed-by: Friedemann Kleint --- .../patches/0003-Disable-srwlock-for-mingw.patch | 13 +++++++++++++ src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch new file mode 100644 index 00000000000..ab7acfe40b9 --- /dev/null +++ b/src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch @@ -0,0 +1,13 @@ +diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +index f043bdc289..2355de091f 100644 +--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h ++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +@@ -3298,7 +3298,7 @@ void *aligned_alloc(size_t alignment, size_t size) + std::shared_mutex m_Mutex; + }; + #define VMA_RW_MUTEX VmaRWMutex +- #elif defined(_WIN32) ++ #elif defined(_WIN32) && !defined(__MINGW32__) + // Use SRWLOCK from WinAPI. + class VmaRWMutex + { diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h index f043bdc2899..2355de091f8 100644 --- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h @@ -3298,7 +3298,7 @@ void *aligned_alloc(size_t alignment, size_t size) std::shared_mutex m_Mutex; }; #define VMA_RW_MUTEX VmaRWMutex - #elif defined(_WIN32) + #elif defined(_WIN32) && !defined(__MINGW32__) // Use SRWLOCK from WinAPI. class VmaRWMutex {