From c3a7de95c873337d7e29b40f979fd2cb632d32a2 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 23 Jul 2015 09:58:17 -0600 Subject: loader: Do not include dbg helpers in dispatch The DEBUG_REPORT callback helpers do not need to be included in the dispatch table as they are not API entrypoints. They are functions specifically and only for DEBUG_REPORT DbgCreateMsgCallback. --- include/vk_debug_report_lunarg.h | 3 --- include/vk_layer.h | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/vk_debug_report_lunarg.h b/include/vk_debug_report_lunarg.h index a53f5955..af4dc843 100644 --- a/include/vk_debug_report_lunarg.h +++ b/include/vk_debug_report_lunarg.h @@ -201,9 +201,6 @@ typedef void (*PFN_vkDbgMsgCallback)( typedef VkResult (VKAPI *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, const void* pUserData, VkDbgMsgCallback* pMsgCallback); typedef VkResult (VKAPI *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDbgMsgCallback msgCallback); -typedef void (VKAPI *PFN_vkDbgStringCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData); -typedef void (VKAPI *PFN_vkDbgStdioCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData); -typedef void (VKAPI *PFN_vkDbgBreakCallback)(VkFlags msgFlags, VkDbgObjectType objType, uint64_t srcObject, size_t location, int32_t msgCode, const char* pLayerPrefix, const char* pMsg, void* pUserData); #ifdef VK_PROTOTYPES diff --git a/include/vk_layer.h b/include/vk_layer.h index 129265f6..56e45f17 100644 --- a/include/vk_layer.h +++ b/include/vk_layer.h @@ -169,9 +169,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkQueuePresentWSI QueuePresentWSI; PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; - PFN_vkDbgStringCallback DbgStringCallback; - PFN_vkDbgStdioCallback DbgStdioCallback; - PFN_vkDbgBreakCallback DbgBreakCallback; } VkLayerDispatchTable; typedef struct VkLayerInstanceDispatchTable_ @@ -193,9 +190,6 @@ typedef struct VkLayerInstanceDispatchTable_ PFN_vkGetPhysicalDeviceSurfaceSupportWSI GetPhysicalDeviceSurfaceSupportWSI; PFN_vkDbgCreateMsgCallback DbgCreateMsgCallback; PFN_vkDbgDestroyMsgCallback DbgDestroyMsgCallback; - PFN_vkDbgStringCallback DbgStringCallback; - PFN_vkDbgStdioCallback DbgStdioCallback; - PFN_vkDbgBreakCallback DbgBreakCallback; } VkLayerInstanceDispatchTable; // LL node for tree of dbg callback functions -- cgit v1.2.3