fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 13:58:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radv: Handle device memory alloc failure with normal free.

Browse source 
Less duplication/complexity.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen 2019-07-10 14:21:11 +02:00 • committed by Bas Nieuwenhuizen
parent e1469c02cf
commit 825ddfee59
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/amd/vulkan/radv_device.c
View file

@ -3419,6 +3419,23 @@ bool radv_get_memory_fd(struct radv_device *device,
pFD); pFD);
} }
static void radv_free_memory(struct radv_device *device,
const VkAllocationCallbacks* pAllocator,
struct radv_device_memory *mem)
{
if (mem == NULL)
return;
if (mem->bo) {
radv_bo_list_remove(device, mem->bo);
device->ws->buffer_destroy(mem->bo);
mem->bo = NULL;
}
vk_free2(&device->alloc, pAllocator, mem);
}
static VkResult radv_alloc_memory(struct radv_device *device, static VkResult radv_alloc_memory(struct radv_device *device,
const VkMemoryAllocateInfo* pAllocateInfo, const VkMemoryAllocateInfo* pAllocateInfo,
const VkAllocationCallbacks* pAllocator, const VkAllocationCallbacks* pAllocator,
@ -3450,7 +3467,7 @@ static VkResult radv_alloc_memory(struct radv_device *device,
const struct wsi_memory_allocate_info *wsi_info = const struct wsi_memory_allocate_info *wsi_info =
vk_find_struct_const(pAllocateInfo->pNext, WSI_MEMORY_ALLOCATE_INFO_MESA); vk_find_struct_const(pAllocateInfo->pNext, WSI_MEMORY_ALLOCATE_INFO_MESA);
mem = vk_alloc2(&device->alloc, pAllocator, sizeof(*mem), 8, mem = vk_zalloc2(&device->alloc, pAllocator, sizeof(*mem), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (mem == NULL) if (mem == NULL)
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
@ -3477,6 +3494,7 @@ static VkResult radv_alloc_memory(struct radv_device *device,
(int)(priority_float * RADV_BO_PRIORITY_APPLICATION_MAX)); (int)(priority_float * RADV_BO_PRIORITY_APPLICATION_MAX));
mem->user_ptr = NULL; mem->user_ptr = NULL;
mem->bo = NULL;
if (import_info) { if (import_info) {
assert(import_info->handleType == assert(import_info->handleType ==
@ -3538,15 +3556,14 @@ static VkResult radv_alloc_memory(struct radv_device *device,
result = radv_bo_list_add(device, mem->bo); result = radv_bo_list_add(device, mem->bo);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
goto fail_bo; goto fail;
*pMem = radv_device_memory_to_handle(mem); *pMem = radv_device_memory_to_handle(mem);
return VK_SUCCESS; return VK_SUCCESS;
fail_bo:
device->ws->buffer_destroy(mem->bo);
fail: fail:
radv_free_memory(device, pAllocator,mem);
vk_free2(&device->alloc, pAllocator, mem); vk_free2(&device->alloc, pAllocator, mem);
return result; return result;
@ -3570,14 +3587,7 @@ void radv_FreeMemory(
RADV_FROM_HANDLE(radv_device, device, _device); RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_device_memory, mem, _mem); RADV_FROM_HANDLE(radv_device_memory, mem, _mem);
if (mem == NULL) radv_free_memory(device, pAllocator, mem);
return;
radv_bo_list_remove(device, mem->bo);
device->ws->buffer_destroy(mem->bo);
mem->bo = NULL;
vk_free2(&device->alloc, pAllocator, mem);
} }
VkResult radv_MapMemory( VkResult radv_MapMemory(