Module: Mesa Branch: main Commit: 1d676fdee94753b590cd6c4dd09213a4d224e880 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d676fdee94753b590cd6c4dd09213a4d224e880
Author: Mike Blumenkrantz <[email protected]> Date: Fri Sep 24 15:29:46 2021 -0400 zink: split vk debug logging into separate functions being able to breakpoint these easily is crucial to debugging, and it sucks to always have to go back and check the line numbers, so now there's easily-rememberable functions for it Reviewed-by: Hoe Hao Cheng <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13042> --- src/gallium/drivers/zink/zink_screen.c | 36 +++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index b40f1e39387..1789de3143c 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1337,6 +1337,30 @@ check_have_device_time(struct zink_screen *screen) return false; } +static void +zink_error(const char *msg) +{ + fprintf(stderr, "zink ERR: '%s'\n", msg); +} + +static void +zink_warn(const char *msg) +{ + fprintf(stderr, "zink WRN: '%s'\n", msg); +} + +static void +zink_info(const char *msg) +{ + fprintf(stderr, "zink NFO: '%s'\n", msg); +} + +static void +zink_msg(const char *msg) +{ + fprintf(stderr, "zink MSG: '%s'\n", msg); +} + static VKAPI_ATTR VkBool32 VKAPI_CALL zink_debug_util_callback( VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, @@ -1344,19 +1368,17 @@ zink_debug_util_callback( const VkDebugUtilsMessengerCallbackDataEXT *pCallbackData, void *pUserData) { - const char *severity = "MSG"; - // Pick message prefix and color to use. // Only MacOS and Linux have been tested for color support if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT) { - severity = "ERR"; + zink_error(pCallbackData->pMessage); } else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) { - severity = "WRN"; + zink_warn(pCallbackData->pMessage); } else if (messageSeverity & VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT) { - severity = "NFO"; - } + zink_info(pCallbackData->pMessage); + } else + zink_msg(pCallbackData->pMessage); - fprintf(stderr, "zink DEBUG: %s: '%s'\n", severity, pCallbackData->pMessage); return VK_FALSE; }
