From 87d25d509b7edfce73f7918594117a50e2645be2 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 17 Mar 2016 13:59:51 -0600 Subject: layers: Fix 'Debug Report callbacks not removed' error messages Change-Id: If214e07ab7fd8e50af0528c36595bf92716357f3 --- layers/vk_layer_utils.cpp | 4 ++-- layers/vk_layer_utils.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layers/vk_layer_utils.cpp b/layers/vk_layer_utils.cpp index 5d7268e0..d44a3b26 100644 --- a/layers/vk_layer_utils.cpp +++ b/layers/vk_layer_utils.cpp @@ -611,12 +611,12 @@ VkStringErrorFlags vk_string_validate(const int max_length, const char *utf8) { return result; } -void layer_debug_actions(debug_report_data *report_data, std::vector logging_callback, +void layer_debug_actions(debug_report_data *report_data, std::vector &logging_callback, const VkAllocationCallbacks *pAllocator, const char *layer_identifier) { uint32_t report_flags = 0; uint32_t debug_action = 0; - VkDebugReportCallbackEXT callback; + VkDebugReportCallbackEXT callback = VK_NULL_HANDLE; std::string report_flags_key = layer_identifier; std::string debug_action_key = layer_identifier; diff --git a/layers/vk_layer_utils.h b/layers/vk_layer_utils.h index 464c2483..1dc2e0ed 100644 --- a/layers/vk_layer_utils.h +++ b/layers/vk_layer_utils.h @@ -96,7 +96,7 @@ typedef enum VkStringErrorFlagBits { } VkStringErrorFlagBits; typedef VkFlags VkStringErrorFlags; -void layer_debug_actions(debug_report_data* report_data, std::vector logging_callback, +void layer_debug_actions(debug_report_data* report_data, std::vector &logging_callback, const VkAllocationCallbacks *pAllocator, const char* layer_identifier); static inline bool vk_format_is_undef(VkFormat format) { return (format == VK_FORMAT_UNDEFINED); } -- cgit v1.2.3