commit 58a9e406f1d02738661b52427f1c96f0278d4ffd
author Adam Sawicki <Adam.Sawicki@amd.com> Mon Dec 10 13:32:55 2018 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> Mon Dec 10 13:32:55 2018 +0100
tree 1d1dd455f42fb01031f24e2af0bf810d3a9bad04
parent e31dd15ff5100bdbdd22e0e930164a9051d514f5

VmaBlockVector::Defragment: Minor fix for case when VMA_DEBUG_DETECT_CORRUPTION != 0.

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index 0d10b55..7cd7ad6 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -12119,9 +12119,13 @@
     

     const VkMemoryPropertyFlags memPropFlags =

         m_hAllocator->m_MemProps.memoryTypes[m_MemoryTypeIndex].propertyFlags;

+    const bool isHostVisible = (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;

+    const bool isHostCoherent = (memPropFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0;

+

     const bool canDefragmentOnCpu = maxCpuBytesToMove > 0 && maxCpuAllocationsToMove > 0 &&

-        (memPropFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) != 0;

-    const bool canDefragmentOnGpu = maxGpuBytesToMove > 0 && maxGpuAllocationsToMove > 0;

+        isHostVisible;

+    const bool canDefragmentOnGpu = maxGpuBytesToMove > 0 && maxGpuAllocationsToMove > 0 &&

+        (VMA_DEBUG_DETECT_CORRUPTION == 0 || !(isHostVisible && isHostCoherent));

 

     // There are options to defragment this memory type.

     if(canDefragmentOnCpu || canDefragmentOnGpu)