Module: Mesa Branch: staging/20.0 Commit: ac5cb6a66c8faf63443993c84d6cf85aac93d3eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac5cb6a66c8faf63443993c84d6cf85aac93d3eb
Author: Jason Ekstrand <[email protected]> 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 <[email protected]> Acked-by: Kristian H. Kristensen <[email protected]> Acked-by: Bas Nieuwenhuizen <[email protected]> Reviewed-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4690> (cherry picked from commit 9d10bde5a878aac440ea34dfb304812cd00b231c) --- .pick_status.json | 2 +- src/vulkan/util/vk_debug_report.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 9b7f9f57a2e..378e937b727 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -373,7 +373,7 @@ "description": "vulkan: Allow destroying NULL debug report callbacks", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "086cfa5652ec202f87c14d11e0f6c959d75987d8" }, 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; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
