Fix inconsistency in reporting device local memory between type and heap on macOS.

This commit is contained in:
Bill Hollings 2019-12-06 10:18:13 -05:00
parent 5f9e946232
commit 98e0b79a52
2 changed files with 2 additions and 1 deletions

View File

@ -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*.

View File

@ -1844,7 +1844,7 @@ void MVKPhysicalDevice::initMemoryProperties() {
// 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