From 33bdd756399e1d149bf8c9ae64606d5c80d49b10 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 17 Aug 2022 06:22:17 +1000
Subject: [PATCH] nvk: handle NULL to destroy descriptor pool

Fixes dEQP-VK.api.null_handle.destroy_descriptor_pool

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_descriptor_set.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/nouveau/vulkan/nvk_descriptor_set.c b/src/nouveau/vulkan/nvk_descriptor_set.c
index b1cf00ac57c..f5e138a5010 100644
--- a/src/nouveau/vulkan/nvk_descriptor_set.c
+++ b/src/nouveau/vulkan/nvk_descriptor_set.c
@@ -437,6 +437,9 @@ nvk_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool,
    VK_FROM_HANDLE(nvk_device, device, _device);
    VK_FROM_HANDLE(nvk_descriptor_pool, pool, _pool);
 
+   if (!_pool)
+      return;
+
    nvk_destroy_descriptor_pool(device, pAllocator, pool);
 }