aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCourtney Goeltzenleuchter <courtneygo@google.com>2015-11-25 14:07:05 -0700
committerJon Ashburn <jon@lunarg.com>2015-12-17 11:20:06 -0700
commitdd0e617a6c5865c5a0d8ef6b9f626535b5c0708d (patch)
tree1063bedd66fd8a701f77c7675df028160b97587a /include
parent8afd6cacb305f4727aa662401048d6f5b5993ad3 (diff)
downloadusermoji-dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d.tar.xz
debug_report: Rename VkDbgMsgCallback object
Diffstat (limited to 'include')
-rw-r--r--include/vulkan/vk_layer.h2
-rw-r--r--include/vulkan/vk_lunarg_debug_report.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
index a2b25d2d..471f8ff3 100644
--- a/include/vulkan/vk_layer.h
+++ b/include/vulkan/vk_layer.h
@@ -204,7 +204,7 @@ typedef struct VkLayerInstanceDispatchTable_
// LL node for tree of dbg callback functions
typedef struct VkLayerDbgFunctionNode_
{
- VkDbgMsgCallback msgCallback;
+ VkDebugReportCallbackLUNARG msgCallback;
PFN_vkDbgMsgCallback pfnMsgCallback;
VkFlags msgFlags;
const void *pUserData;
diff --git a/include/vulkan/vk_lunarg_debug_report.h b/include/vulkan/vk_lunarg_debug_report.h
index 37793d81..5fc3de0b 100644
--- a/include/vulkan/vk_lunarg_debug_report.h
+++ b/include/vulkan/vk_lunarg_debug_report.h
@@ -84,7 +84,7 @@ typedef enum {
#define VK_EXT_LUNARG_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_LUNARG_debug_report"
-VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDbgMsgCallback)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackLUNARG)
// ------------------------------------------------------------------------------------------------
// Enumerations
@@ -127,8 +127,8 @@ typedef VkBool32 (*PFN_vkDbgMsgCallback)(
// ------------------------------------------------------------------------------------------------
// API functions
-typedef VkResult (VKAPI_PTR *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDbgMsgCallback* pMsgCallback);
-typedef VkResult (VKAPI_PTR *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDbgMsgCallback msgCallback);
+typedef VkResult (VKAPI_PTR *PFN_vkDbgCreateMsgCallback)(VkInstance instance, VkFlags msgFlags, const PFN_vkDbgMsgCallback pfnMsgCallback, void* pUserData, VkDebugReportCallbackLUNARG* pMsgCallback);
+typedef VkResult (VKAPI_PTR *PFN_vkDbgDestroyMsgCallback)(VkInstance instance, VkDebugReportCallbackLUNARG msgCallback);
#ifdef VK_PROTOTYPES
@@ -138,11 +138,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkDbgCreateMsgCallback(
VkFlags msgFlags,
const PFN_vkDbgMsgCallback pfnMsgCallback,
void* pUserData,
- VkDbgMsgCallback* pMsgCallback);
+ VkDebugReportCallbackLUNARG* pMsgCallback);
VKAPI_ATTR VkResult VKAPI_CALL vkDbgDestroyMsgCallback(
VkInstance instance,
- VkDbgMsgCallback msgCallback);
+ VkDebugReportCallbackLUNARG msgCallback);
#endif // VK_PROTOTYPES