diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-01-18 17:42:08 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2016-01-19 13:30:45 -0700 |
| commit | a5a167a32441683837d21a2dd506946fca6301c3 (patch) | |
| tree | 2dc52a37c9114dfeec722f6b01ce9d6d7840809f | |
| parent | eafb6206f2b5f0c2a66cb8ea285c17e40c1894ed (diff) | |
| download | usermoji-a5a167a32441683837d21a2dd506946fca6301c3.tar.xz | |
debug_report: MR141, Change pUserData to match type used elsewhere
Other uses of pUserData in Vulkan do not have a const qualifier,
remove it for this pUserData.
| -rw-r--r-- | demos/cube.c | 4 | ||||
| -rw-r--r-- | demos/vulkaninfo.c | 2 | ||||
| -rw-r--r-- | icd/common/icd-instance.h | 2 | ||||
| -rw-r--r-- | include/vulkan/vk_ext_debug_report.h | 4 | ||||
| -rw-r--r-- | include/vulkan/vk_layer.h | 2 | ||||
| -rw-r--r-- | layers/vk_layer_logging.h | 4 | ||||
| -rw-r--r-- | loader/debug_report.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/demos/cube.c b/demos/cube.c index 44c34b73..5de15a6b 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -263,7 +263,7 @@ VkBool32 dbgFunc( int32_t msgCode, const char* pLayerPrefix, const char* pMsg, - const void* pUserData) + void* pUserData) { char *message = (char *) malloc(strlen(pMsg)+100); @@ -307,7 +307,7 @@ VkBool32 BreakCallback( int32_t msgCode, const char* pLayerPrefix, const char* pMsg, - const void* pUserData) + void* pUserData) { #ifndef WIN32 raise(SIGTRAP); diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index f4c05ab8..53f1e96b 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -137,7 +137,7 @@ VkBool32 dbg_callback( int32_t msgCode, const char* pLayerPrefix, const char* pMsg, - const void* pUserData) + void* pUserData) { char *message = (char *) malloc(strlen(pMsg)+100); diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h index f94006ac..5ea5e0c6 100644 --- a/icd/common/icd-instance.h +++ b/icd/common/icd-instance.h @@ -36,7 +36,7 @@ extern "C" { struct icd_instance_logger { PFN_vkDebugReportCallbackEXT func; - const void *user_data; + void *user_data; VkFlags flags; struct icd_instance_logger *next; diff --git a/include/vulkan/vk_ext_debug_report.h b/include/vulkan/vk_ext_debug_report.h index 40d0df3e..e9577b94 100644 --- a/include/vulkan/vk_ext_debug_report.h +++ b/include/vulkan/vk_ext_debug_report.h @@ -106,7 +106,7 @@ typedef VkBool32 (VKAPI_PTR *PFN_vkDebugReportCallbackEXT)( int32_t messageCode, const char* pLayerPrefix, const char* pMessage, - const void* pUserData); + void* pUserData); typedef struct VkDebugReportCallbackCreateInfoEXT { @@ -114,7 +114,7 @@ typedef struct VkDebugReportCallbackCreateInfoEXT { const void* pNext; VkDebugReportFlagsEXT flags; PFN_vkDebugReportCallbackEXT pfnCallback; - const void* pUserData; + void* pUserData; } VkDebugReportCallbackCreateInfoEXT; typedef VkResult (VKAPI_PTR *PFN_vkCreateDebugReportCallbackEXT)(VkInstance instance, const VkDebugReportCallbackCreateInfoEXT* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDebugReportCallbackEXT* pCallback); diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index 546e91d6..aeb6ab91 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -208,7 +208,7 @@ typedef struct VkLayerDbgFunctionNode_ VkDebugReportCallbackEXT msgCallback; PFN_vkDebugReportCallbackEXT pfnMsgCallback; VkFlags msgFlags; - const void *pUserData; + void *pUserData; struct VkLayerDbgFunctionNode_ *pNext; } VkLayerDbgFunctionNode; diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h index b1f3ac42..06a27a3b 100644 --- a/layers/vk_layer_logging.h +++ b/layers/vk_layer_logging.h @@ -307,7 +307,7 @@ static inline VKAPI_ATTR VkBool32 VKAPI_CALL log_callback( int32_t msgCode, const char* pLayerPrefix, const char* pMsg, - const void* pUserData) + void* pUserData) { char msg_flags[30]; @@ -328,7 +328,7 @@ static inline VKAPI_ATTR VkBool32 VKAPI_CALL win32_debug_output_msg( int32_t msgCode, const char* pLayerPrefix, const char* pMsg, - const void* pUserData) + void* pUserData) { #ifdef WIN32 char msg_flags[30]; diff --git a/loader/debug_report.c b/loader/debug_report.c index 7d1a9b31..f949729a 100644 --- a/loader/debug_report.c +++ b/loader/debug_report.c @@ -128,7 +128,7 @@ VkBool32 util_DebugReportMessage( msgCode, pLayerPrefix, pMsg, - (void *) pTrav->pUserData)) { + pTrav->pUserData)) { bail = true; } } |