OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: fixup unwinding of device create failure

Browse Source 
We appear to have the ordering mixed up a bit.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3203>
This commit is contained in:
Lionel Landwerlin
2019-12-25 22:08:51 +02:00
committed by Marge Bot
parent faf28b83fd
commit f36708b143
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/intel/vulkan/anv_device.c
View File

@@ -2984,7 +2984,7 @@ VkResult anv_CreateDevice(
unreachable("unhandled gen");
}
if (result != VK_SUCCESS)
goto fail_workaround_bo;
goto fail_clear_value_bo;
anv_pipeline_cache_init(&device->default_pipeline_cache, device, true);
@@ -2998,13 +2998,14 @@ VkResult anv_CreateDevice(
return VK_SUCCESS;
fail_workaround_bo:
anv_scratch_pool_finish(device, &device->scratch_pool);
fail_clear_value_bo:
if (device->info.gen >= 10)
anv_device_release_bo(device, device->hiz_clear_bo);
anv_device_release_bo(device, device->workaround_bo);
anv_scratch_pool_finish(device, &device->scratch_pool);
fail_trivial_batch_bo:
anv_device_release_bo(device, device->trivial_batch_bo);
fail_workaround_bo:
anv_device_release_bo(device, device->workaround_bo);
fail_surface_aux_map_pool:
if (device->info.gen >= 12) {
gen_aux_map_finish(device->aux_map_ctx);