From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sat, 23 Dec 2017 11:37:13 +0000 (+0100)
Subject: radv: Use the meta fast clear destructor on construction failure.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8abaa3aeaa0c146676ccef50075e550ceea6271a;p=mesa.git

radv: Use the meta fast clear destructor on construction failure.

Simplifies failure paths. The caller already calls
radv_device_finish_meta_fast_clear_flush_state on failure.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c
index 44c2ff52617..2603229a1f7 100644
--- a/src/amd/vulkan/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/radv_meta_fast_clear.c
@@ -248,7 +248,7 @@ create_pipeline(struct radv_device *device,
 					       &device->meta_state.alloc,
 					       &device->meta_state.fast_clear_flush.fmask_decompress_pipeline);
 	if (result != VK_SUCCESS)
-		goto cleanup_cmask;
+		goto cleanup;
 
 	result = radv_graphics_pipeline_create(device_h,
 					       radv_pipeline_cache_to_handle(&device->meta_state.cache),
@@ -294,13 +294,10 @@ create_pipeline(struct radv_device *device,
 					       &device->meta_state.alloc,
 					       &device->meta_state.fast_clear_flush.dcc_decompress_pipeline);
 	if (result != VK_SUCCESS)
-		goto cleanup_fmask;
+		goto cleanup;
 
 	goto cleanup;
-cleanup_fmask:
-	radv_DestroyPipeline(device_h, device->meta_state.fast_clear_flush.fmask_decompress_pipeline, &device->meta_state.alloc);
-cleanup_cmask:
-	radv_DestroyPipeline(device_h, device->meta_state.fast_clear_flush.cmask_eliminate_pipeline, &device->meta_state.alloc);
+
 cleanup:
 	ralloc_free(fs_module.nir);
 	return result;