Merge pull request #447 from Agrael1/master

adam-sawicki-a · web-flow · commit 5fadb5d497ad · 2024-09-02T13:33:28.000+02:00
Fix for ABI interop (without VK_KHR_external_memory_win32)
diff --git a/include/vk_mem_alloc.h b/include/vk_mem_alloc.h
@@ -10593,8 +10593,7 @@ VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)
     m_Id(0),
     m_hMemory(VK_NULL_HANDLE),
     m_MapCount(0),
-    m_pMappedData(VMA_NULL),
-    m_Handle(VMA_NULL) {}
+    m_pMappedData(VMA_NULL){}
 
 VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()
 {

Original file line number	Diff line number	Diff line change
`@@ -10593,8 +10593,7 @@ VmaDeviceMemoryBlock::VmaDeviceMemoryBlock(VmaAllocator hAllocator)`
`10593`	`10593`	`m_Id(0),`
`10594`	`10594`	`m_hMemory(VK_NULL_HANDLE),`
`10595`	`10595`	`m_MapCount(0),`
`10596`		`- m_pMappedData(VMA_NULL),`
`10597`		`- m_Handle(VMA_NULL) {}`
	`10596`	`+ m_pMappedData(VMA_NULL){}`
`10598`	`10597`
`10599`	`10598`	`VmaDeviceMemoryBlock::~VmaDeviceMemoryBlock()`
`10600`	`10599`	`{`