From f36708b143fec1a09c46ea13324df08c0cb5f667 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 25 Dec 2019 22:08:51 +0200 Subject: [PATCH] anv: fixup unwinding of device create failure We appear to have the ordering mixed up a bit. Signed-off-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index d9f15b46332..5b4c952a338 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -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); -- 2.30.2