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

adam-sawicki-a · adam-sawicki-a · commit 2af57d7f4775 · 2018-12-06T15:35:05.000+01:00
diff --git a/src/Tests.cpp b/src/Tests.cpp
@@ -1158,7 +1158,7 @@ static void RecreateAllocationResource(AllocInfo& allocation)
         // 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);
diff --git a/src/vk_mem_alloc.h b/src/vk_mem_alloc.h
@@ -8329,7 +8329,7 @@ bool VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible(
         }
     }
 
-    return !typeConflictFound || minAlignment >= bufferImageGranularity;
+    return typeConflictFound || minAlignment >= bufferImageGranularity;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Original file line number	Diff line number	Diff line change
`@@ -8329,7 +8329,7 @@ bool VmaBlockMetadata_Generic::IsBufferImageGranularityConflictPossible(`
`8329`	`8329`	`}`
`8330`	`8330`	`}`
`8331`	`8331`
`8332`		`- return !typeConflictFound \|\| minAlignment >= bufferImageGranularity;`
	`8332`	`+ return typeConflictFound \|\| minAlignment >= bufferImageGranularity;`
`8333`	`8333`	`}`
`8334`	`8334`
`8335`	`8335`	`////////////////////////////////////////////////////////////////////////////////`