commit 2af57d7f4775334d3656fa1b95eff6bf0305a65d
author Adam Sawicki <Adam.Sawicki@amd.com> Thu Dec 06 15:35:05 2018 +0100
committer Adam Sawicki <Adam.Sawicki@amd.com> Thu Dec 06 15:35:05 2018 +0100
tree 4727ef7fc49c84f44e8d91728a654282756e6190
parent 0eeed593097499e9f2e5c13f6aa9e062e56a9288

Fixed bug in VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible. Another minor fix.

src/Tests.cpp

diff --git a/src/Tests.cpp b/src/Tests.cpp
index bd498b7..0f1392e 100644
--- a/src/Tests.cpp
+++ b/src/Tests.cpp
@@ -1158,7 +1158,7 @@
         // Just to silence validation layer warnings.

         VkMemoryRequirements vkMemReq;

         vkGetBufferMemoryRequirements(g_hDevice, allocation.m_Buffer, &vkMemReq);

-        TEST(vkMemReq.size == allocation.m_BufferInfo.size);

+        TEST(vkMemReq.size >= allocation.m_BufferInfo.size);

 

         res = vkBindBufferMemory(g_hDevice, allocation.m_Buffer, allocInfo.deviceMemory, allocInfo.offset);

         TEST(res == VK_SUCCESS);

src/vk_mem_alloc.h

diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
index b50ed60..35ea532 100644
--- a/src/vk_mem_alloc.h
+++ b/src/vk_mem_alloc.h
@@ -8329,7 +8329,7 @@
         }

     }

 

-    return !typeConflictFound || minAlignment >= bufferImageGranularity;

+    return typeConflictFound || minAlignment >= bufferImageGranularity;

 }

 

 ////////////////////////////////////////////////////////////////////////////////