commit 107a0d2c026eab02c2dfdb1abef7ff2fb8c207ca
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 1b8dcb7c7309158b07583ec0723ffb4df64d2085
parent bbaf97984092fdfbb53d78f768ee25c4b3dd6fb9

debug_report: Rename VkDbgMsgCallback object

layers/swapchain.cpp

diff --git a/layers/swapchain.cpp b/layers/swapchain.cpp
index 08ee63d..4c41928 100644
--- a/layers/swapchain.cpp
+++ b/layers/swapchain.cpp
@@ -115,7 +115,7 @@
     uint32_t debug_action = 0;
     FILE *log_output = NULL;
     const char *option_str;
-    VkDbgMsgCallback callback;
+    VkDebugReportCallbackLUNARG callback;
 
     // Initialize Swapchain options:
     report_flags = getLayerOptionFlags("SwapchainReportFlags", 0);
@@ -209,7 +209,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();
         }
@@ -1113,7 +1113,7 @@
     return NULL;
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDbgMsgCallback* pMsgCallback)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(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);
     VkResult result = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback);
@@ -1123,7 +1123,7 @@
     return result;
 }
 
-VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDbgMsgCallback msgCallback)
+VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(VkInstance instance, VkDebugReportCallbackLUNARG msgCallback)
 {
     layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map);
     VkResult result = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback);