diff options
Diffstat (limited to 'src/3rdparty/VulkanMemoryAllocator/patches/0004-Avoid-compiler-warnings.patch')
| -rw-r--r-- | src/3rdparty/VulkanMemoryAllocator/patches/0004-Avoid-compiler-warnings.patch | 327 |
1 files changed, 0 insertions, 327 deletions
diff --git a/src/3rdparty/VulkanMemoryAllocator/patches/0004-Avoid-compiler-warnings.patch b/src/3rdparty/VulkanMemoryAllocator/patches/0004-Avoid-compiler-warnings.patch deleted file mode 100644 index c9c841eefd..0000000000 --- a/src/3rdparty/VulkanMemoryAllocator/patches/0004-Avoid-compiler-warnings.patch +++ /dev/null @@ -1,327 +0,0 @@ -From 6b27f49d0a2d2391654cd89f9a9ef77fad934f66 Mon Sep 17 00:00:00 2001 -From: Laszlo Agocs <laszlo.agocs@qt.io> -Date: Thu, 14 Jan 2021 11:57:18 +0100 -Subject: [PATCH 4/4] Avoid compiler warnings - -Change-Id: I3c9bc051229b02efeae60e27a53c3c4d17c7f995 ---- - .../VulkanMemoryAllocator/vk_mem_alloc.h | 84 ++++++++++++------- - 1 file changed, 56 insertions(+), 28 deletions(-) - -diff --git a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h -index 79efc1f0da..ebaeb4bcff 100644 ---- a/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h -+++ b/src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h -@@ -4080,7 +4080,7 @@ static void VmaWriteMagicValue(void* pData, VkDeviceSize offset) - #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - uint32_t* pDst = (uint32_t*)((char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); -- for(size_t i = 0; i < numberCount; ++i, ++pDst) -+ for(size_t i = 0; i != numberCount; ++i, ++pDst) - { - *pDst = VMA_CORRUPTION_DETECTION_MAGIC_VALUE; - } -@@ -4094,7 +4094,7 @@ static bool VmaValidateMagicValue(const void* pData, VkDeviceSize offset) - #if VMA_DEBUG_MARGIN > 0 && VMA_DEBUG_DETECT_CORRUPTION - const uint32_t* pSrc = (const uint32_t*)((const char*)pData + offset); - const size_t numberCount = VMA_DEBUG_MARGIN / sizeof(uint32_t); -- for(size_t i = 0; i < numberCount; ++i, ++pSrc) -+ for(size_t i = 0; i != numberCount; ++i, ++pSrc) - { - if(*pSrc != VMA_CORRUPTION_DETECTION_MAGIC_VALUE) - { -@@ -4339,7 +4339,7 @@ public: - template<typename U> VmaStlAllocator(const VmaStlAllocator<U>& src) : m_pCallbacks(src.m_pCallbacks) { } - - T* allocate(size_t n) { return VmaAllocateArray<T>(m_pCallbacks, n); } -- void deallocate(T* p, size_t n) { VmaFree(m_pCallbacks, p); } -+ void deallocate(T* p, size_t /*n*/) { VmaFree(m_pCallbacks, p); } - - template<typename U> - bool operator==(const VmaStlAllocator<U>& rhs) const -@@ -6067,7 +6067,7 @@ public: - - virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount); - -- virtual VkResult CheckCorruption(const void* pBlockData) { return VK_ERROR_FEATURE_NOT_PRESENT; } -+ virtual VkResult CheckCorruption(const void* /*pBlockData*/) { return VK_ERROR_FEATURE_NOT_PRESENT; } - - virtual void Alloc( - const VmaAllocationRequest& request, -@@ -6637,7 +6637,7 @@ public: - bool overlappingMoveSupported); - virtual ~VmaDefragmentationAlgorithm_Fast(); - -- virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) { ++m_AllocationCount; } -+ virtual void AddAllocation(VmaAllocation /*hAlloc*/, VkBool32* /*pChanged*/) { ++m_AllocationCount; } - virtual void AddAll() { m_AllAllocations = true; } - - virtual VkResult Defragment( -@@ -7699,6 +7699,7 @@ void VmaJsonWriter::BeginValue(bool isString) - if(currItem.type == COLLECTION_TYPE_OBJECT && - currItem.valueCount % 2 == 0) - { -+ (void) isString; - VMA_ASSERT(isString); - } - -@@ -8251,7 +8252,9 @@ bool VmaBlockMetadata_Generic::Validate() const - } - - // Margin required between allocations - every free space must be at least that large. -+#if VMA_DEBUG_MARGIN - VMA_VALIDATE(subAlloc.size >= VMA_DEBUG_MARGIN); -+#endif - } - else - { -@@ -8397,6 +8400,7 @@ bool VmaBlockMetadata_Generic::CreateAllocationRequest( - { - VMA_ASSERT(allocSize > 0); - VMA_ASSERT(!upperAddress); -+ (void) upperAddress; - VMA_ASSERT(allocType != VMA_SUBALLOCATION_TYPE_FREE); - VMA_ASSERT(pAllocationRequest != VMA_NULL); - VMA_HEAVY_ASSERT(Validate()); -@@ -10136,10 +10140,12 @@ bool VmaBlockMetadata_Linear::CreateAllocationRequest_UpperAddress( - // Apply VMA_DEBUG_MARGIN at the end. - if(VMA_DEBUG_MARGIN > 0) - { -+#if VMA_DEBUG_MARGIN - if(resultOffset < VMA_DEBUG_MARGIN) - { - return false; - } -+#endif - resultOffset -= VMA_DEBUG_MARGIN; - } - -@@ -11079,18 +11085,19 @@ void VmaBlockMetadata_Buddy::PrintDetailedMap(class VmaJsonWriter& json) const - #endif // #if VMA_STATS_STRING_ENABLED - - bool VmaBlockMetadata_Buddy::CreateAllocationRequest( -- uint32_t currentFrameIndex, -- uint32_t frameInUseCount, -+ uint32_t /*currentFrameIndex*/, -+ uint32_t /*frameInUseCount*/, - VkDeviceSize bufferImageGranularity, - VkDeviceSize allocSize, - VkDeviceSize allocAlignment, - bool upperAddress, - VmaSuballocationType allocType, -- bool canMakeOtherLost, -- uint32_t strategy, -+ bool /*canMakeOtherLost*/, -+ uint32_t /*strategy*/, - VmaAllocationRequest* pAllocationRequest) - { - VMA_ASSERT(!upperAddress && "VMA_ALLOCATION_CREATE_UPPER_ADDRESS_BIT can be used only with linear algorithm."); -+ (void) upperAddress; - - // Simple way to respect bufferImageGranularity. May be optimized some day. - // Whenever it might be an OPTIMAL image... -@@ -11131,8 +11138,8 @@ bool VmaBlockMetadata_Buddy::CreateAllocationRequest( - } - - bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost( -- uint32_t currentFrameIndex, -- uint32_t frameInUseCount, -+ uint32_t /*currentFrameIndex*/, -+ uint32_t /*frameInUseCount*/, - VmaAllocationRequest* pAllocationRequest) - { - /* -@@ -11142,7 +11149,7 @@ bool VmaBlockMetadata_Buddy::MakeRequestedAllocationsLost( - return pAllocationRequest->itemsToMakeLostCount == 0; - } - --uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) -+uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t /*currentFrameIndex*/, uint32_t /*frameInUseCount*/) - { - /* - Lost allocations are not supported in buddy allocator at the moment. -@@ -11153,7 +11160,7 @@ uint32_t VmaBlockMetadata_Buddy::MakeAllocationsLost(uint32_t currentFrameIndex, - - void VmaBlockMetadata_Buddy::Alloc( - const VmaAllocationRequest& request, -- VmaSuballocationType type, -+ VmaSuballocationType /*type*/, - VkDeviceSize allocSize, - VmaAllocation hAllocation) - { -@@ -11480,7 +11487,7 @@ void VmaBlockMetadata_Buddy::PrintDetailedMapNode(class VmaJsonWriter& json, con - //////////////////////////////////////////////////////////////////////////////// - // class VmaDeviceMemoryBlock - --VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator) : -+VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator /*hAllocator*/) : - m_pMetadata(VMA_NULL), - m_MemoryTypeIndex(UINT32_MAX), - m_Id(0), -@@ -12268,6 +12275,7 @@ VkResult VmaBlockVector::AllocatePage( - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBestRequestBlock->WriteMagicValueAroundAllocation(m_hAllocator, bestRequest.offset, size); -+ (void) res; - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); - } - return VK_SUCCESS; -@@ -12314,6 +12322,7 @@ void VmaBlockVector::Free( - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->ValidateMagicValueAroundAllocation(m_hAllocator, hAllocation->GetOffset(), hAllocation->GetSize()); -+ (void) res; - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to validate magic value."); - } - -@@ -12472,6 +12481,7 @@ VkResult VmaBlockVector::AllocateFromBlock( - if(IsCorruptionDetectionEnabled()) - { - VkResult res = pBlock->WriteMagicValueAroundAllocation(m_hAllocator, currRequest.offset, size); -+ (void) res; - VMA_ASSERT(res == VK_SUCCESS && "Couldn't map block memory to write magic value."); - } - return VK_SUCCESS; -@@ -12481,7 +12491,8 @@ VkResult VmaBlockVector::AllocateFromBlock( - - VkResult VmaBlockVector::CreateBlock(VkDeviceSize blockSize, size_t* pNewBlockIndex) - { -- VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; -+ VkMemoryAllocateInfo allocInfo = {}; -+ allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocInfo.memoryTypeIndex = m_MemoryTypeIndex; - allocInfo.allocationSize = blockSize; - VkDeviceMemory mem = VK_NULL_HANDLE; -@@ -12570,7 +12581,8 @@ void VmaBlockVector::ApplyDefragmentationMovesCpu( - if(pDefragCtx->res == VK_SUCCESS) - { - const VkDeviceSize nonCoherentAtomSize = m_hAllocator->m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; -- VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE }; -+ VkMappedMemoryRange memRange = {}; -+ memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; - - for(size_t moveIndex = 0; moveIndex < moveCount; ++moveIndex) - { -@@ -13032,7 +13044,7 @@ VmaDefragmentationAlgorithm_Generic::VmaDefragmentationAlgorithm_Generic( - VmaAllocator hAllocator, - VmaBlockVector* pBlockVector, - uint32_t currentFrameIndex, -- bool overlappingMoveSupported) : -+ bool /*overlappingMoveSupported*/) : - VmaDefragmentationAlgorithm(hAllocator, pBlockVector, currentFrameIndex), - m_AllocationCount(0), - m_AllAllocations(false), -@@ -15032,8 +15044,13 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory( - bool map, - bool isUserDataString, - void* pUserData, -+#if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - VkBuffer dedicatedBuffer, - VkImage dedicatedImage, -+#else -+ VkBuffer /*dedicatedBuffer*/, -+ VkImage /*dedicatedImage*/, -+#endif - size_t allocationCount, - VmaAllocation* pAllocations) - { -@@ -15050,12 +15067,14 @@ VkResult VmaAllocator_T::AllocateDedicatedMemory( - } - } - -- VkMemoryAllocateInfo allocInfo = { VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO }; -+ VkMemoryAllocateInfo allocInfo = {}; -+ allocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocInfo.memoryTypeIndex = memTypeIndex; - allocInfo.allocationSize = size; - - #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 -- VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR }; -+ VkMemoryDedicatedAllocateInfoKHR dedicatedAllocInfo = {}; -+ dedicatedAllocInfo.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR; - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { - if(dedicatedBuffer != VK_NULL_HANDLE) -@@ -15195,12 +15214,15 @@ void VmaAllocator_T::GetBufferMemoryRequirements( - #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { -- VkBufferMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR }; -+ VkBufferMemoryRequirementsInfo2KHR memReqInfo = {}; -+ memReqInfo.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR; - memReqInfo.buffer = hBuffer; - -- VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; -+ VkMemoryDedicatedRequirementsKHR memDedicatedReq = {}; -+ memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR; - -- VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; -+ VkMemoryRequirements2KHR memReq2 = {}; -+ memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR; - memReq2.pNext = &memDedicatedReq; - - (*m_VulkanFunctions.vkGetBufferMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); -@@ -15227,12 +15249,15 @@ void VmaAllocator_T::GetImageMemoryRequirements( - #if VMA_DEDICATED_ALLOCATION || VMA_VULKAN_VERSION >= 1001000 - if(m_UseKhrDedicatedAllocation || m_VulkanApiVersion >= VK_MAKE_VERSION(1, 1, 0)) - { -- VkImageMemoryRequirementsInfo2KHR memReqInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR }; -+ VkImageMemoryRequirementsInfo2KHR memReqInfo = {}; -+ memReqInfo.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR; - memReqInfo.image = hImage; - -- VkMemoryDedicatedRequirementsKHR memDedicatedReq = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR }; -+ VkMemoryDedicatedRequirementsKHR memDedicatedReq = {}; -+ memDedicatedReq.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS_KHR; - -- VkMemoryRequirements2KHR memReq2 = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR }; -+ VkMemoryRequirements2KHR memReq2 = {}; -+ memReq2.sType = VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR; - memReq2.pNext = &memDedicatedReq; - - (*m_VulkanFunctions.vkGetImageMemoryRequirements2KHR)(m_hDevice, &memReqInfo, &memReq2); -@@ -15461,13 +15486,13 @@ VkResult VmaAllocator_T::ResizeAllocation( - // This function is deprecated and so it does nothing. It's left for backward compatibility. - if(newSize == 0 || alloc->GetLastUseFrameIndex() == VMA_FRAME_INDEX_LOST) - { -- return VK_ERROR_VALIDATION_FAILED_EXT; -+ return VkResult(-1000011001); // VK_ERROR_VALIDATION_FAILED_EXT - } - if(newSize == alloc->GetSize()) - { - return VK_SUCCESS; - } -- return VK_ERROR_OUT_OF_POOL_MEMORY; -+ return VkResult(-1000069000); // VK_ERROR_OUT_OF_POOL_MEMORY - } - - void VmaAllocator_T::CalculateStats(VmaStats* pStats) -@@ -15780,6 +15805,7 @@ void VmaAllocator_T::DestroyPool(VmaPool pool) - { - VmaMutexLockWrite lock(m_PoolsMutex, m_UseMutex); - bool success = VmaVectorRemoveSorted<VmaPointerLess>(m_Pools, pool); -+ (void) success; - VMA_ASSERT(success && "Pool not found in Allocator."); - } - -@@ -16111,7 +16137,8 @@ void VmaAllocator_T::FlushOrInvalidateAllocation( - - const VkDeviceSize nonCoherentAtomSize = m_PhysicalDeviceProperties.limits.nonCoherentAtomSize; - -- VkMappedMemoryRange memRange = { VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE }; -+ VkMappedMemoryRange memRange = {}; -+ memRange.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; - memRange.memory = hAllocation->GetMemory(); - - switch(hAllocation->GetType()) -@@ -16184,6 +16211,7 @@ void VmaAllocator_T::FreeDedicatedMemory(const VmaAllocation allocation) - AllocationVectorType* const pDedicatedAllocations = m_pDedicatedAllocations[memTypeIndex]; - VMA_ASSERT(pDedicatedAllocations); - bool success = VmaVectorRemoveSorted<VmaPointerLess>(*pDedicatedAllocations, allocation); -+ (void) success; - VMA_ASSERT(success); - } - --- -2.23.0.windows.1 - |