diff --git a/src/System/Debug.hpp b/src/System/Debug.hpp
index 56f6db3..69bb4e4 100644
--- a/src/System/Debug.hpp
+++ b/src/System/Debug.hpp
@@ -56,10 +56,14 @@
 // debugging log. Disabled if SWIFTSHADER_DISABLE_TRACE is defined.
 #if defined(SWIFTSHADER_DISABLE_TRACE)
 #	define TRACE(message, ...) (void(0))
-#	define TRACE_ASSERT(message, ...) (void(0))
 #else
 #	define TRACE(message, ...) sw::trace("%s:%d TRACE: " message "\n", __FILE__, __LINE__, ##__VA_ARGS__)
-#	define LOG_TRAP(message, ...) sw::log_trap("%s:%d %s TRACE_ASSERT: " message "\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__)
+#endif
+
+#if defined(SWIFTSHADER_DISABLE_TRACE) || defined(NDEBUG)
+#	define LOG_TRAP(message, ...) (void(0))
+#else
+#	define LOG_TRAP(message, ...) sw::log_trap("%s:%d %s LOG TRAP: " message "\n", __FILE__, __LINE__, __func__, ##__VA_ARGS__)
 #endif
 
 // A macro to print a warning message to the debugging log and stderr to denote