From dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 25 Nov 2015 14:07:05 -0700 Subject: debug_report: Rename VkDbgMsgCallback object --- layers/image.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'layers/image.cpp') diff --git a/layers/image.cpp b/layers/image.cpp index 2156c5fa..e4892864 100644 --- a/layers/image.cpp +++ b/layers/image.cpp @@ -53,7 +53,7 @@ using namespace std; struct layer_data { debug_report_data *report_data; - vector logging_callback; + vector logging_callback; VkLayerDispatchTable* device_dispatch_table; VkLayerInstanceDispatchTable *instance_dispatch_table; VkPhysicalDevice physicalDevice; @@ -74,7 +74,7 @@ static unordered_map layer_data_map; static void InitImage(layer_data *data, const VkAllocationCallbacks *pAllocator) { - VkDbgMsgCallback callback; + VkDebugReportCallbackLUNARG callback; uint32_t report_flags = getLayerOptionFlags("ImageReportFlags", 0); uint32_t debug_action = 0; @@ -99,7 +99,7 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback( VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, - VkDbgMsgCallback* pMsgCallback) + VkDebugReportCallbackLUNARG* pMsgCallback) { layer_data *my_data = get_my_data_ptr(get_dispatch_key(instance), layer_data_map); VkResult res = my_data->instance_dispatch_table->DbgCreateMsgCallback(instance, msgFlags, pfnMsgCallback, pUserData, pMsgCallback); @@ -111,7 +111,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); VkResult res = my_data->instance_dispatch_table->DbgDestroyMsgCallback(instance, msgCallback); @@ -144,7 +144,7 @@ VK_LAYER_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroyInstance(VkInstance instance // 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(); } -- cgit v1.2.3