layers: Add DEBUG_OUTPUT support to mem_tracker

1 files changed, 13 insertions, 5 deletions

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index 92177a2f..47d4c017 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -54,12 +54,11 @@ static const VkDeviceMemory MEMTRACKER_SWAP_CHAIN_IMAGE_KEY = static_cast<VkDevi
 struct layer_data {
     debug_report_data *report_data;
     // TODO: put instance data here
-    VkDbgMsgCallback logging_callback;
+    std::vector<VkDbgMsgCallback> logging_callback;
     bool wsi_enabled;
 
     layer_data() :
         report_data(nullptr),
-        logging_callback(nullptr),
         wsi_enabled(false)
     {};
 };
@@ -921,6 +920,7 @@ static void init_mem_tracker(
     uint32_t debug_action = 0;
     FILE *log_output = NULL;
     const char *option_str;
+    VkDbgMsgCallback callback;
     // initialize MemTracker options
     report_flags = getLayerOptionFlags("MemTrackerReportFlags", 0);
     getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &debug_action);
@@ -929,7 +929,13 @@ static void init_mem_tracker(
     {
         option_str = getLayerOption("MemTrackerLogFilename");
         log_output = getLayerLogOutput(option_str, "MemTracker");
-        layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &my_data->logging_callback);
+        layer_create_msg_callback(my_data->report_data, report_flags, log_callback, (void *) log_output, &callback);
+        my_data->logging_callback.push_back(callback);
+    }
+
+    if (debug_action & VK_DBG_LAYER_ACTION_DEBUG_OUTPUT) {
+        layer_create_msg_callback(my_data->report_data, report_flags, win32_debug_output_msg, NULL, &callback);
+        my_data->logging_callback.push_back(callback);
     }
 
     if (!globalLockInitialized)
@@ -957,8 +963,10 @@ VK_LAYER_EXPORT void VKAPI vkDestroyInstance(VkInstance instance)
 
     // Clean up logging callback, if any
     layer_data *my_data = get_my_data_ptr(key, layer_data_map);
-    if (my_data->logging_callback) {
-        layer_destroy_msg_callback(my_data->report_data, my_data->logging_callback);
+    while (my_data->logging_callback.size() > 0) {
+        VkDbgMsgCallback callback = my_data->logging_callback.back();
+        layer_destroy_msg_callback(my_data->report_data, callback);
+        my_data->logging_callback.pop_back();
     }
 
     layer_debug_report_destroy_instance(mid(instance));