Mesa (master): vulkan: Allow destroying NULL debug report callbacks
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon May 4 14:31:35 UTC 2020
Module: Mesa
Branch: master
Commit: 9d10bde5a878aac440ea34dfb304812cd00b231c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d10bde5a878aac440ea34dfb304812cd00b231c
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Tue Apr 21 11:29:21 2020 -0500
vulkan: Allow destroying NULL debug report callbacks
Fixes: 086cfa5652 "anv: implementation of VK_EXT_debug_report extension"
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Acked-by: Kristian H. Kristensen <hoegsberg at google.com>
Acked-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4690>
---
src/vulkan/util/vk_debug_report.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/vulkan/util/vk_debug_report.c b/src/vulkan/util/vk_debug_report.c
index c4884b963e0..78dcfa6e218 100644
--- a/src/vulkan/util/vk_debug_report.c
+++ b/src/vulkan/util/vk_debug_report.c
@@ -77,6 +77,9 @@ vk_destroy_debug_report_callback(struct vk_debug_report_instance *instance,
const VkAllocationCallbacks* pAllocator,
const VkAllocationCallbacks* instance_allocator)
{
+ if (_callback == VK_NULL_HANDLE)
+ return;
+
struct vk_debug_report_callback *callback =
(struct vk_debug_report_callback *)(uintptr_t)_callback;
More information about the mesa-commit
mailing list