From bf3b2d29125f711d6a62dd8e18d9ab915569f8fb Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 15 Jul 2024 16:50:35 +0200
Subject: [PATCH] radv/meta: remove useless checks for NULL handles before
 destroying

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30187>
---
 src/amd/vulkan/radv_query.c | 47 +++++++++++++------------------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 38e978eca39..7ab546a4617 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1072,37 +1072,22 @@ radv_device_init_meta_query_state(struct radv_device *device, bool on_demand)
 void
 radv_device_finish_meta_query_state(struct radv_device *device)
 {
-   if (device->meta_state.query.tfb_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.tfb_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.pipeline_statistics_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.pipeline_statistics_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.occlusion_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.occlusion_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.timestamp_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.timestamp_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.pg_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.pg_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.ms_prim_gen_query_pipeline)
-      radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.ms_prim_gen_query_pipeline,
-                           &device->meta_state.alloc);
-
-   if (device->meta_state.query.p_layout)
-      radv_DestroyPipelineLayout(radv_device_to_handle(device), device->meta_state.query.p_layout,
-                                 &device->meta_state.alloc);
-
-   if (device->meta_state.query.ds_layout)
-      device->vk.dispatch_table.DestroyDescriptorSetLayout(
-         radv_device_to_handle(device), device->meta_state.query.ds_layout, &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.tfb_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.pipeline_statistics_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.occlusion_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.timestamp_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.pg_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipeline(radv_device_to_handle(device), device->meta_state.query.ms_prim_gen_query_pipeline,
+                        &device->meta_state.alloc);
+   radv_DestroyPipelineLayout(radv_device_to_handle(device), device->meta_state.query.p_layout,
+                              &device->meta_state.alloc);
+   device->vk.dispatch_table.DestroyDescriptorSetLayout(radv_device_to_handle(device),
+                                                        device->meta_state.query.ds_layout, &device->meta_state.alloc);
 }
 
 static void