From ef2cef49a3939c119d012ff67398232362129f20 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 24 Oct 2022 15:11:30 +0200 Subject: [PATCH] vkmemalloc: Disable more warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifedd263cb39ebad6babdab7687a22ad23f2c9471 Reviewed-by: Qt CI Bot Reviewed-by: Mårten Nordheim --- .../patches/0005-Disable-more-warnings.patch | 33 +++++++++++++++++++ .../VulkanMemoryAllocator/vk_mem_alloc.h | 4 +++ 2 files changed, 37 insertions(+) create mode 100644 src/3rdparty/VulkanMemoryAllocator/patches/0005-Disable-more-warnings.patch diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0005-Disable-more-warnings.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0005-Disable-more-warnings.patch new file mode 100644 index 0000000000..f6ac509039 --- /dev/null +++ b/src/3rdparty/VulkanMemoryAllocator/patches/0005-Disable-more-warnings.patch @@ -0,0 +1,33 @@ +From 4a6d29420041e1f0a14450853887226ff838b917 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs +Date: Mon, 24 Oct 2022 15:11:30 +0200 +Subject: [PATCH] vkmemalloc: Disable more warnings + +Change-Id: Ifedd263cb39ebad6babdab7687a22ad23f2c9471 +--- + src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +index 18081839c0..1b27eeac16 100644 +--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h ++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +@@ -2570,11 +2570,15 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( + #pragma GCC diagnostic ignored "-Wunused-variable" + #pragma GCC diagnostic ignored "-Wunused-parameter" + #pragma GCC diagnostic ignored "-Wmissing-field-initializers" ++#pragma GCC diagnostic ignored "-Wparentheses" ++#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" + #elif defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wunused-variable" + #pragma clang diagnostic ignored "-Wunused-parameter" + #pragma clang diagnostic ignored "-Wmissing-field-initializers" ++#pragma clang diagnostic ignored "-Wparentheses" ++#pragma clang diagnostic ignored "-Wimplicit-fallthrough" + #if defined(__APPLE__) + #pragma clang diagnostic ignored "-Wnullability-completeness" + #endif +-- +2.36.1.windows.1 + diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h index 18081839c0..1b27eeac16 100644 --- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h @@ -2570,11 +2570,15 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString( #pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wmissing-field-initializers" +#pragma GCC diagnostic ignored "-Wparentheses" +#pragma GCC diagnostic ignored "-Wimplicit-fallthrough" #elif defined(__clang__) #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wunused-parameter" #pragma clang diagnostic ignored "-Wmissing-field-initializers" +#pragma clang diagnostic ignored "-Wparentheses" +#pragma clang diagnostic ignored "-Wimplicit-fallthrough" #if defined(__APPLE__) #pragma clang diagnostic ignored "-Wnullability-completeness" #endif