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

loader/debug_report.c

diff --git a/loader/debug_report.c b/loader/debug_report.c
index cadb70c..b7057e6 100644
--- a/loader/debug_report.c
+++ b/loader/debug_report.c
@@ -70,7 +70,7 @@
         VkFlags msgFlags,
         const PFN_vkDbgMsgCallback pfnMsgCallback,
         void* pUserData,
-        VkDbgMsgCallback* pMsgCallback)
+        VkDebugReportCallbackLUNARG* pMsgCallback)
 {
     VkLayerDbgFunctionNode *pNewDbgFuncNode = (VkLayerDbgFunctionNode *) loader_heap_alloc((struct loader_instance *)instance, sizeof(VkLayerDbgFunctionNode), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
     if (!pNewDbgFuncNode)
@@ -95,7 +95,7 @@
 
 static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DbgDestroyMsgCallback(
         VkInstance instance,
-        VkDbgMsgCallback msg_callback)
+        VkDebugReportCallbackLUNARG msg_callback)
 {
     struct loader_instance *inst = loader_get_instance(instance);
     loader_platform_thread_lock_mutex(&loader_lock);
@@ -131,9 +131,9 @@
         VkFlags                             msgFlags,
         const PFN_vkDbgMsgCallback          pfnMsgCallback,
         void*                               pUserData,
-        VkDbgMsgCallback*                   pMsgCallback)
+        VkDebugReportCallbackLUNARG*                   pMsgCallback)
 {
-    VkDbgMsgCallback *icd_info;
+    VkDebugReportCallbackLUNARG *icd_info;
     const struct loader_icd *icd;
     struct loader_instance *inst;
     VkResult res;
@@ -144,7 +144,7 @@
             break;
     }
 
-    icd_info = calloc(sizeof(VkDbgMsgCallback), inst->total_icd_count);
+    icd_info = calloc(sizeof(VkDebugReportCallbackLUNARG), inst->total_icd_count);
     if (!icd_info) {
         return VK_ERROR_OUT_OF_HOST_MEMORY;
     }
@@ -183,7 +183,7 @@
         return res;
     }
 
-    *(VkDbgMsgCallback **)pMsgCallback = icd_info;
+    *(VkDebugReportCallbackLUNARG **)pMsgCallback = icd_info;
 
     return VK_SUCCESS;
 }
@@ -194,10 +194,10 @@
  */
 VKAPI_ATTR VkResult VKAPI_CALL loader_DbgDestroyMsgCallback(
         VkInstance instance,
-        VkDbgMsgCallback msgCallback)
+        VkDebugReportCallbackLUNARG msgCallback)
 {
     uint32_t storage_idx;
-    VkDbgMsgCallback *icd_info;
+    VkDebugReportCallbackLUNARG *icd_info;
     const struct loader_icd *icd;
     VkResult res = VK_SUCCESS;
     struct loader_instance *inst;
@@ -207,7 +207,7 @@
             break;
     }
 
-    icd_info = *(VkDbgMsgCallback **) &msgCallback;
+    icd_info = *(VkDebugReportCallbackLUNARG **) &msgCallback;
     storage_idx = 0;
     for (icd = inst->icds; icd; icd = icd->next) {
         if (icd_info[storage_idx]) {

loader/debug_report.h

diff --git a/loader/debug_report.h b/loader/debug_report.h
index 722e0c8..a6107a7 100644
--- a/loader/debug_report.h
+++ b/loader/debug_report.h
@@ -107,8 +107,8 @@
     VkFlags                             msgFlags,
     const PFN_vkDbgMsgCallback          pfnMsgCallback,
     void*                               pUserData,
-    VkDbgMsgCallback*                   pMsgCallback);
+    VkDebugReportCallbackLUNARG*                   pMsgCallback);
 
 VKAPI_ATTR VkResult VKAPI_CALL loader_DbgDestroyMsgCallback(
     VkInstance                          instance,
-    VkDbgMsgCallback                    msgCallback);
+    VkDebugReportCallbackLUNARG                    msgCallback);

loader/loader.h

diff --git a/loader/loader.h b/loader/loader.h
index 1c1dd2d..2b44de3 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -341,8 +341,8 @@
 extern const VkLayerInstanceDispatchTable instance_disp;
 
 struct loader_msg_callback_map_entry {
-    VkDbgMsgCallback icd_obj;
-    VkDbgMsgCallback loader_obj;
+    VkDebugReportCallbackLUNARG icd_obj;
+    VkDebugReportCallbackLUNARG loader_obj;
 };
 
 bool compare_vk_extension_properties(