radv: split the device local memory heap into two

[mesa.git] / src / amd / vulkan / radv_device.c

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 86505f400459abf4d9d3988340cd3ed57ae64c70..512d366722d7a42b2f982bcbe9ebdc8cb513544d 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -530,27 +530,32 @@ void radv_GetPhysicalDeviceMemoryProperties(
        pMemoryProperties->memoryTypes[1] = (VkMemoryType) {
                .propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
                VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-               .heapIndex = 1,
+               .heapIndex = 2,
        };
        pMemoryProperties->memoryTypes[2] = (VkMemoryType) {
                .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT |
                VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
                VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
-               .heapIndex = 0,
+               .heapIndex = 1,
        };
        pMemoryProperties->memoryTypes[3] = (VkMemoryType) {
                .propertyFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
                VK_MEMORY_PROPERTY_HOST_COHERENT_BIT |
                VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
-               .heapIndex = 1,
+               .heapIndex = 2,
        };
 
-       pMemoryProperties->memoryHeapCount = 2;
+       pMemoryProperties->memoryHeapCount = 3;
        pMemoryProperties->memoryHeaps[0] = (VkMemoryHeap) {
-               .size = physical_device->rad_info.vram_size,
+               .size = physical_device->rad_info.vram_size -
+                               physical_device->rad_info.visible_vram_size,
                .flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
        };
        pMemoryProperties->memoryHeaps[1] = (VkMemoryHeap) {
+               .size = physical_device->rad_info.visible_vram_size,
+               .flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT,
+       };
+       pMemoryProperties->memoryHeaps[2] = (VkMemoryHeap) {
                .size = physical_device->rad_info.gart_size,
                .flags = 0,
        };