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 /layers/mem_tracker.cpp | |
| parent | 8afd6cacb305f4727aa662401048d6f5b5993ad3 (diff) | |
| download | usermoji-dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d.tar.xz | |
debug_report: Rename VkDbgMsgCallback object
Diffstat (limited to 'layers/mem_tracker.cpp')
| -rw-r--r-- | layers/mem_tracker.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/layers/mem_tracker.cpp b/layers/mem_tracker.cpp index cf889f69..bd65bcbc 100644 --- a/layers/mem_tracker.cpp +++ b/layers/mem_tracker.cpp @@ -54,7 +54,7 @@ static const VkDeviceMemory MEMTRACKER_SWAP_CHAIN_IMAGE_KEY = (VkDeviceMemory)(- 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 @@ init_mem_tracker( 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 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyInstance( // 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 void VKAPI_CALL vkCmdResetQueryPool( } 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 vkDbgCreateMsgCallback( 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; |