radv: remove VkPhysicalDeviceMemoryProperties2 workaround

This reverts 03888bf09c

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16694>
This commit is contained in:
Yiwei Zhang 2022-05-24 16:41:45 +00:00 committed by Marge Bot
parent a19e1f338e
commit 229538d6da

View file

@ -2620,21 +2620,7 @@ radv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice,
{
RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice);
pMemoryProperties->memoryProperties.memoryTypeCount = pdevice->memory_properties.memoryTypeCount;
for (uint32_t i = 0; i < pdevice->memory_properties.memoryTypeCount; i++) {
pMemoryProperties->memoryProperties.memoryTypes[i] = (VkMemoryType) {
.propertyFlags = pdevice->memory_properties.memoryTypes[i].propertyFlags,
.heapIndex = pdevice->memory_properties.memoryTypes[i].heapIndex,
};
}
pMemoryProperties->memoryProperties.memoryHeapCount = pdevice->memory_properties.memoryHeapCount;
for (uint32_t i = 0; i < pdevice->memory_properties.memoryHeapCount; i++) {
pMemoryProperties->memoryProperties.memoryHeaps[i] = (VkMemoryHeap) {
.size = pdevice->memory_properties.memoryHeaps[i].size,
.flags = pdevice->memory_properties.memoryHeaps[i].flags,
};
}
pMemoryProperties->memoryProperties = pdevice->memory_properties;
VkPhysicalDeviceMemoryBudgetPropertiesEXT *memory_budget =
vk_find_struct(pMemoryProperties->pNext, PHYSICAL_DEVICE_MEMORY_BUDGET_PROPERTIES_EXT);