From ab7330ad578fd9083b7f3e039a11de4b7fd20603 Mon Sep 17 00:00:00 2001
From: Mike Smith <mango@live.cn>
Date: Sun, 2 Mar 2025 20:20:12 +0800
Subject: [PATCH] better logging

---
 include/luisa/core/logging.h | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/include/luisa/core/logging.h b/include/luisa/core/logging.h
index 74ee3a4f0..b4aa903a4 100644
--- a/include/luisa/core/logging.h
+++ b/include/luisa/core/logging.h
@@ -87,35 +87,45 @@ LC_CORE_API void log_flush() noexcept;
 
 }// namespace luisa
 
+#define LUISA_LOGGING_FORMAT_IMPL(f) f
+#define LUISA_LOGGING_FORMAT_IMPL_WITH_FMT(f, ...) \
+    ::fmt::format(FMT_STRING(f), __VA_ARGS__)
+
+#define LUISA_LOGGING_FORMAT(f, ...) \
+    LUISA_LOGGING_FORMAT_IMPL##__VA_OPT__(_WITH_FMT)(f __VA_OPT__(, ) __VA_ARGS__)
+
 /**
  * @brief Verbose logging
  * 
  * Ex. LUISA_VERBOSE("function {} returns {}", functionName, functionReturnInt);
  */
-#define LUISA_VERBOSE(f, ...) \
-    ::luisa::log_verbose(::fmt::format(FMT_STRING(f) __VA_OPT__(, ) __VA_ARGS__))
+#define LUISA_VERBOSE(fmt, ...) \
+    ::luisa::log_verbose(LUISA_LOGGING_FORMAT(fmt __VA_OPT__(, ) __VA_ARGS__))
+
 /**
  * @brief Info logging
  * 
  * Ex. LUISA_INFO("function {} returns {}", functionName, functionReturnInt);
  */
-#define LUISA_INFO(f, ...) \
-    ::luisa::log_info(::fmt::format(FMT_STRING(f) __VA_OPT__(, ) __VA_ARGS__))
+#define LUISA_INFO(fmt, ...) \
+    ::luisa::log_info(LUISA_LOGGING_FORMAT(fmt __VA_OPT__(, ) __VA_ARGS__))
+
 /**
  * @brief Warning logging
  * 
  * Ex. LUISA_WARNING("function {} returns {}", functionName, functionReturnInt);
  */
-#define LUISA_WARNING(f, ...) \
-    ::luisa::log_warning(::fmt::format(FMT_STRING(f) __VA_OPT__(, ) __VA_ARGS__))
+#define LUISA_WARNING(fmt, ...) \
+    ::luisa::log_warning(LUISA_LOGGING_FORMAT(fmt __VA_OPT__(, ) __VA_ARGS__))
+
 /**
  * @brief Error logging
  * 
  * After logging error message, the program will be aborted.
  * Ex. LUISA_ERROR("function {} returns {}", functionName, functionReturnInt);
  */
-#define LUISA_ERROR(f, ...) \
-    ::luisa::log_error(::fmt::format(FMT_STRING(f) __VA_OPT__(, ) __VA_ARGS__))
+#define LUISA_ERROR(fmt, ...) \
+    ::luisa::log_error(LUISA_LOGGING_FORMAT(fmt __VA_OPT__(, ) __VA_ARGS__))
 
 /// LUISA_VERBOSE with file and line information
 #define LUISA_VERBOSE_WITH_LOCATION(fmt, ...) \