diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-01-18 22:34:37 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2021-01-19 13:17:55 +0000 |
| commit | 43d379797af833ee758dede2cd87b6f6b36770c0 (patch) | |
| tree | 4ed5c0e5590360f86537737321bd75139d158f00 /src | |
| parent | c6d602990901bb44b9268b1603b25d3c76c97683 (diff) | |
vkmemalloc: Silence clang warning about unused member var
Change-Id: Id968fd2302e3ff7b4d1a20cd8dd1f4d789588511
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/patches/0006-Silence-clang-warning-about-unused-member-var.patch | 40 | ||||
| -rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 6 |
2 files changed, 43 insertions, 3 deletions
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0006-Silence-clang-warning-about-unused-member-var.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0006-Silence-clang-warning-about-unused-member-var.patch new file mode 100644 index 0000000000..3589deff98 --- /dev/null +++ b/src/3rdparty/VulkanMemoryAllocator/patches/0006-Silence-clang-warning-about-unused-member-var.patch @@ -0,0 +1,40 @@ +From 60d151dfd9ffa2e133af50fde05c5eaae9186bee Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Mon, 18 Jan 2021 22:34:37 +0100 +Subject: [PATCH] Silence clang warning about unused member var + +Change-Id: Id968fd2302e3ff7b4d1a20cd8dd1f4d789588511 +--- + src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +index 6b10e1eb94..4f3fe1c451 100644 +--- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h ++++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +@@ -6865,7 +6865,7 @@ public: + private: + const VmaAllocator m_hAllocator; + const uint32_t m_CurrFrameIndex; +- const uint32_t m_Flags; ++ //const uint32_t m_Flags; + VmaDefragmentationStats* const m_pStats; + // Owner of these objects. + VmaBlockVectorDefragmentationContext* m_DefaultPoolContexts[VK_MAX_MEMORY_TYPES]; +@@ -13782,11 +13782,11 @@ void VmaBlockVectorDefragmentationContext::Begin(bool overlappingMoveSupported) + VmaDefragmentationContext_T::VmaDefragmentationContext_T( + VmaAllocator hAllocator, + uint32_t currFrameIndex, +- uint32_t flags, ++ uint32_t /*flags*/, + VmaDefragmentationStats* pStats) : + m_hAllocator(hAllocator), + m_CurrFrameIndex(currFrameIndex), +- m_Flags(flags), ++ //m_Flags(flags), + m_pStats(pStats), + m_CustomPoolContexts(VmaStlAllocator<VmaBlockVectorDefragmentationContext*>(hAllocator->GetAllocationCallbacks())) + { +-- +2.24.2 (Apple Git-127) + diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h index 6b10e1eb94..4f3fe1c451 100644 --- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h +++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h @@ -6865,7 +6865,7 @@ public: private: const VmaAllocator m_hAllocator; const uint32_t m_CurrFrameIndex; - const uint32_t m_Flags; + //const uint32_t m_Flags; VmaDefragmentationStats* const m_pStats; // Owner of these objects. VmaBlockVectorDefragmentationContext* m_DefaultPoolContexts[VK_MAX_MEMORY_TYPES]; @@ -13782,11 +13782,11 @@ void VmaBlockVectorDefragmentationContext::Begin(bool overlappingMoveSupported) VmaDefragmentationContext_T::VmaDefragmentationContext_T( VmaAllocator hAllocator, uint32_t currFrameIndex, - uint32_t flags, + uint32_t /*flags*/, VmaDefragmentationStats* pStats) : m_hAllocator(hAllocator), m_CurrFrameIndex(currFrameIndex), - m_Flags(flags), + //m_Flags(flags), m_pStats(pStats), m_CustomPoolContexts(VmaStlAllocator<VmaBlockVectorDefragmentationContext*>(hAllocator->GetAllocationCallbacks())) { |