diff --git a/graphics/src/vulkan_base.c b/graphics/src/vulkan_base.c index 63a4d6d9..f5ce8d3e 100644 --- a/graphics/src/vulkan_base.c +++ b/graphics/src/vulkan_base.c @@ -143,7 +143,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL debug_callback(VkDebugUtilsMessageSeverityFlagBit (void)message_type; (void)user_data; - fprintf(stderr, "validation layer: %s\n", callback_data->pMessage); + LOGD(callback_data->pMessage); return VK_FALSE; } diff --git a/utilities/logger.h b/utilities/logger.h index 7aa0220a..1f7ed2ef 100644 --- a/utilities/logger.h +++ b/utilities/logger.h @@ -17,9 +17,10 @@ #endif #include +#include - -#define LOGGER(log_level, ...) _log_log(log_level, __FILE__, __LINE__, __VA_ARGS__) +#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__) +#define LOGGER(log_level, ...) _log_log(log_level, __FILENAME__, __LINE__, __VA_ARGS__) // #define LOGGER(log_level, ...) printf("[##log_level] %s:%d", __FILE__, __LINE__); printf(__VA_ARGS__) #define LOGT(...) LOGGER(LOGLEVEL_TRACE, __VA_ARGS__) diff --git a/utilities/src/logger.c b/utilities/src/logger.c index 0bc1ffe4..0c74c07b 100644 --- a/utilities/src/logger.c +++ b/utilities/src/logger.c @@ -2,7 +2,7 @@ #include "stdarg.h" const char* log_levels[] = { - "LOGLEVEL_TRACE", "LOGLEVEL_DEBUG", "LOGLEVEL_INFO", "LOGLEVEL_WARNING", "LOGLEVEL_ERROR", "LOGLEVEL_FATAL" + "[TRACE]", "[DEBUG]", "[INFO]", "WARNING", "[ERROR]", "[FATAL]" }; void _log_log(unsigned int level, const char* file, int line, const char* fmt, ...) @@ -11,7 +11,7 @@ void _log_log(unsigned int level, const char* file, int line, const char* fmt, . va_list list; va_start(list, fmt); - fprintf(stdout, "%s %s:%d ", log_levels[level], file, line); + fprintf(stdout, "%s %s:%d: ", log_levels[level], file, line); vfprintf(stdout, fmt, list); fprintf(stdout, "\n"); fflush(stdout);