From dd0e617a6c5865c5a0d8ef6b9f626535b5c0708d Mon Sep 17 00:00:00 2001
From: Courtney Goeltzenleuchter <courtneygo@google.com>
Date: Wed, 25 Nov 2015 14:07:05 -0700
Subject: debug_report: Rename VkDbgMsgCallback object

---
 include/vulkan/vk_layer.h               |  2 +-
 include/vulkan/vk_lunarg_debug_report.h | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'include/vulkan')

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
 
-- 
cgit v1.2.3