Fix inconsistency in reporting device local memory between type and h…

…eap on macOS.
KhronosGroup · Dec 6, 2019 · 98e0b79 · 98e0b79
1 parent 5f9e946
commit 98e0b79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md
@@ -27,6 +27,7 @@ Released TBD
 - Fix image subresource sizing calculations for heap-based textures.
 - Fix `MTLHeap` memory leak in `MVKDeviceMemory`.
 - Fix tessellation break when control stage declares but does not use position builtin.
+- Fix inconsistency in reporting device local memory between type and heap on macOS.
 - Cube demo use `VK_EXT_metal_surface` extension.
 - Support *Xcode 11.2*.
 

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -1844,7 +1844,7 @@ static uint32_t mvkGetEntryProperty(io_registry_entry_t entry, CFStringRef prope
 		// This means we really have two heaps. The second heap is system memory.
 		_memoryProperties.memoryHeapCount = 2;
 		_memoryProperties.memoryHeaps[1].size = mvkGetSystemMemorySize();
-		_memoryProperties.memoryHeaps[1].flags = 0;
+		_memoryProperties.memoryHeaps[1].flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
 		_memoryProperties.memoryTypes[2].heapIndex = 1;	// Shared memory in the shared heap
 	}
 #endif