Mesa (master): radv: Use the meta fast clear destructor on construction failure.

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: 8abaa3aeaa0c146676ccef50075e550ceea6271a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8abaa3aeaa0c146676ccef50075e550ceea6271a

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sat Dec 23 12:37:13 2017 +0100

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 at redhat.com>
Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

---

 src/amd/vulkan/radv_meta_fast_clear.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c
index 44c2ff5261..2603229a1f 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;