diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2015-11-25 14:07:05 -0700 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-17 11:20:06 -0700 |
| commit | dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d (patch) | |
| tree | 1063bedd66fd8a701f77c7675df028160b97587a /loader | |
| parent | 8afd6cacb305f4727aa662401048d6f5b5993ad3 (diff) | |
| download | usermoji-dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d.tar.xz | |
debug_report: Rename VkDbgMsgCallback object
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/debug_report.c | 18 | ||||
| -rw-r--r-- | loader/debug_report.h | 4 | ||||
| -rw-r--r-- | loader/loader.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/loader/debug_report.c b/loader/debug_report.c index cadb70c2..b7057e6c 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -70,7 +70,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL debug_report_DbgCreateMsgCallback( 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_DbgCreateMsgCallback( 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 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgCreateMsgCallback( 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 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgCreateMsgCallback( 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 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgCreateMsgCallback( return res; } - *(VkDbgMsgCallback **)pMsgCallback = icd_info; + *(VkDebugReportCallbackLUNARG **)pMsgCallback = icd_info; return VK_SUCCESS; } @@ -194,10 +194,10 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgCreateMsgCallback( */ 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 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgDestroyMsgCallback( 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]) { diff --git a/loader/debug_report.h b/loader/debug_report.h index 722e0c8d..a6107a7f 100644 --- a/loader/debug_report.h +++ b/loader/debug_report.h @@ -107,8 +107,8 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_DbgCreateMsgCallback( 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); diff --git a/loader/loader.h b/loader/loader.h index 1c1dd2dc..2b44de3b 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -341,8 +341,8 @@ extern loader_platform_thread_mutex loader_json_lock; 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( |