Fix debug assert from happening in release build
The original fix for b/139528538 didn't differentiate between release
and debug builds properly. It just just checked to see if a debugger was
attached.
Now the assert will only happen when a debugger is attached and in a
debug build.
Bug: b/159733084
Change-Id: I9a6407685225c662aeb378be3296b8e4640b279d
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/46028
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Sean Risser <srisser@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
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
