commit dc9592a0f224cc4031e8f16871a5d258f7242d04
author Courtney Goeltzenleuchter <courtneygo@google.com> Wed Nov 25 14:07:05 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Thu Dec 17 11:20:06 2015 -0700
tree 6a23df1ef7b7042a4c84d2a1d33561fe84be4f3c
parent 414c8ca21e8403a5608db294aea251d81da88ef0

debug_report: Rename VkDbgMsgCallback object

layers/mem_tracker.cpp

diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp
index cf889f6..bd65bcb 100644
--- a/layers/mem_tracker.cpp
+++ b/layers/mem_tracker.cpp
@@ -54,7 +54,7 @@
 
 struct layer_data {
     debug_report_data                 *report_data;
-    std::vector<VkDbgMsgCallback>      logging_callback;
+    std::vector<VkDebugReportCallbackLUNARG>      logging_callback;
     VkLayerDispatchTable              *device_dispatch_table;
     VkLayerInstanceDispatchTable      *instance_dispatch_table;
     VkBool32                           wsi_enabled;
@@ -1001,7 +1001,7 @@
     uint32_t debug_action = 0;
     FILE *log_output = NULL;
     const char *option_str;
-    VkDbgMsgCallback callback;
+    VkDebugReportCallbackLUNARG callback;
     // initialize MemTracker options
     report_flags = getLayerOptionFlags("MemTrackerReportFlags", 0);
     getLayerOptionEnum("MemTrackerDebugAction", (uint32_t *) &debug_action);
@@ -1042,7 +1042,7 @@
 
     // Clean up logging callback, if any
     while (my_data->logging_callback.size() > 0) {
-        VkDbgMsgCallback callback = my_data->logging_callback.back();
+        VkDebugReportCallbackLUNARG callback = my_data->logging_callback.back();
         layer_destroy_msg_callback(my_data->report_data, callback);
         my_data->logging_callback.pop_back();
     }
@@ -2562,11 +2562,11 @@
 }
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(
-    VkInstance                  instance,
-    VkFlags                     msgFlags,
-    const PFN_vkDbgMsgCallback  pfnMsgCallback,
-    void                       *pUserData,
-    VkDbgMsgCallback           *pMsgCallback)
+    VkInstance                    instance,
+    VkFlags                       msgFlags,
+    const PFN_vkDbgMsgCallback    pfnMsgCallback,
+    void                         *pUserData,
+    VkDebugReportCallbackLUNARG  *pMsgCallback)
 {
     layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
     VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table;
@@ -2579,7 +2579,7 @@
 
 VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
         VkInstance       instance,
-        VkDbgMsgCallback msgCallback)
+        VkDebugReportCallbackLUNARG msgCallback)
 {
     layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
     VkLayerInstanceDispatchTable *pTable = my_data->instance_dispatch_table;