diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-06-18 10:41:12 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-18 08:53:56 +0000 |
commit | b17e05729e3404d2fe65f28a903a7a1b9f6cc115 (patch) | |
tree | ad6ad058726909c9c7d58b1495d2728f53d72892 /src/3rdparty/VulkanMemoryAllocator | |
parent | 55240bcdf3cc1d6ac357e5007748378c6bf1d7f1 (diff) |
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty/VulkanMemoryAllocator')
-rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch | 13 | ||||
-rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 2 |
2 files changed, 14 insertions, 1 deletions
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 0000000000..ab7acfe40b --- /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 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 { |