zero-overhead logging in more places

Learning-Ray-Tracing-From-Zero · Mar 2, 2025 · 546cb40 · 546cb40
1 parent ab7330a
commit 546cb40
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/include/luisa/core/logging.h b/include/luisa/core/logging.h
@@ -150,10 +150,16 @@ LC_CORE_API void log_flush() noexcept;
     LUISA_NOT_IMPLEMENTED_IMPL##__VA_OPT__(_WITH_MESSAGE)(__VA_ARGS__)
 
 #define LUISA_ASSERT_FAILED_IMPL(x) \
-    LUISA_ERROR_WITH_LOCATION("Assertion '{}' failed.", #x)
+    LUISA_ERROR_WITH_LOCATION("Assertion '" #x "' failed.")
+
+#define LUISA_ASSERT_FAILED_IMPL_WITH_MESSAGE_IMPL_WITH_FMT(x, fmt, ...) \
+    LUISA_ERROR_WITH_LOCATION("Assertion '{}' failed: " fmt, #x, __VA_ARGS__)
+
+#define LUISA_ASSERT_FAILED_IMPL_WITH_MESSAGE_IMPL(x, msg) \
+    LUISA_ERROR_WITH_LOCATION("Assertion '" #x "' failed: " msg)
 
 #define LUISA_ASSERT_FAILED_IMPL_WITH_MESSAGE(x, fmt, ...) \
-    LUISA_ERROR_WITH_LOCATION("Assertion '{}' failed: " fmt, #x __VA_OPT__(, ) __VA_ARGS__)
+    LUISA_ASSERT_FAILED_IMPL_WITH_MESSAGE_IMPL##__VA_OPT__(_WITH_FMT)(x, fmt __VA_OPT__(, ) __VA_ARGS__)
 
 #define LUISA_ASSERT(x, ...)                                                                   \
     do {                                                                                       \

diff --git a/src/backends/fallback/fallback_motion_instance.cpp b/src/backends/fallback/fallback_motion_instance.cpp
@@ -5,7 +5,9 @@ namespace luisa::compute::fallback {
 
 FallbackMotionInstance::FallbackMotionInstance(const AccelMotionOption &option) noexcept
     : _option{option}, _child{nullptr} {
-    LUISA_ASSERT(option.keyframe_count <= 255u, "Motion keyframe count must be less than 256.");
+    LUISA_ASSERT(option.keyframe_count <= 255u,
+                 "Motion keyframe count must be less than 256 (got {}).",
+                 option.keyframe_count);
 }
 
 void FallbackMotionInstance::build(luisa::unique_ptr<MotionInstanceBuildCommand> cmd) noexcept {