1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vkmemalloc: Disable SRWLOCK for mingw

Browse Source 
...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>
This commit is contained in:
Laszlo Agocs 2019-06-18 10:41:12 +02:00 committed by Liang Qi
parent 55240bcdf3
commit b17e05729e
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/3rdparty/VulkanMemoryAllocator/patches/0003-Disable-srwlock-for-mingw.patch vendored Normal file
View File

@ -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
{

2
src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h vendored
View File

@ -3298,7 +3298,7 @@ void *aligned_alloc(size_t alignment, size_t size)
std::shared_mutex m_Mutex; std::shared_mutex m_Mutex;
}; };
#define VMA_RW_MUTEX VmaRWMutex #define VMA_RW_MUTEX VmaRWMutex
#elif defined(_WIN32) #elif defined(_WIN32) && !defined(__MINGW32__)
// Use SRWLOCK from WinAPI. // Use SRWLOCK from WinAPI.
class VmaRWMutex class VmaRWMutex
{ {