From e7d7431b5853b2985bf8f906054ee340901f3f11 Mon Sep 17 00:00:00 2001
From: Hyper <34012267+hyperbx@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:31:37 +0000
Subject: [PATCH] logger: stub out utility logs for Release in the macros

---
 UnleashedRecomp/os/logger.h               | 28 +++++++++++++++++++----
 UnleashedRecomp/os/win32/logger_win32.cpp |  5 ----
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/UnleashedRecomp/os/logger.h b/UnleashedRecomp/os/logger.h
index 9683185..7a05dec 100644
--- a/UnleashedRecomp/os/logger.h
+++ b/UnleashedRecomp/os/logger.h
@@ -8,27 +8,47 @@
 // Function-specific logging.
 
 #define LOG(str)               LOG_IMPL(None, __func__, str)
-#define LOG_UTILITY(str)       LOG_IMPL(Utility, __func__, str)
 #define LOG_WARNING(str)       LOG_IMPL(Warning, __func__, str)
 #define LOG_ERROR(str)         LOG_IMPL(Error, __func__, str)
 
+#if _DEBUG
+#define LOG_UTILITY(str)       LOG_IMPL(Utility, __func__, str)
+#else
+#define LOG_UTILITY(str)
+#endif
+
 #define LOGF(str, ...)         LOGF_IMPL(None, __func__, str, __VA_ARGS__)
-#define LOGF_UTILITY(str, ...) LOGF_IMPL(Utility, __func__, str, __VA_ARGS__)
 #define LOGF_WARNING(str, ...) LOGF_IMPL(Warning, __func__, str, __VA_ARGS__)
 #define LOGF_ERROR(str, ...)   LOGF_IMPL(Error, __func__, str, __VA_ARGS__)
 
+#if _DEBUG
+#define LOGF_UTILITY(str, ...) LOGF_IMPL(Utility, __func__, str, __VA_ARGS__)
+#else
+#define LOGF_UTILITY(str, ...)
+#endif
+
 // Non-function-specific logging.
 
 #define LOGN(str)               LOG_IMPL(None, "*", str)
-#define LOGN_UTILITY(str)       LOG_IMPL(Utility, "*", str)
 #define LOGN_WARNING(str)       LOG_IMPL(Warning, "*", str)
 #define LOGN_ERROR(str)         LOG_IMPL(Error, "*", str)
 
+#if _DEBUG
+#define LOGN_UTILITY(str)       LOG_IMPL(Utility, "*", str)
+#else
+#define LOGN_UTILITY(str)
+#endif
+
 #define LOGFN(str, ...)         LOGF_IMPL(None, "*", str, __VA_ARGS__)
-#define LOGFN_UTILITY(str, ...) LOGF_IMPL(Utility, "*", str, __VA_ARGS__)
 #define LOGFN_WARNING(str, ...) LOGF_IMPL(Warning, "*", str, __VA_ARGS__)
 #define LOGFN_ERROR(str, ...)   LOGF_IMPL(Error, "*", str, __VA_ARGS__)
 
+#if _DEBUG
+#define LOGFN_UTILITY(str, ...) LOGF_IMPL(Utility, "*", str, __VA_ARGS__)
+#else
+#define LOGFN_UTILITY(str, ...)
+#endif
+
 namespace os::logger
 {
     void Log(const std::string& str, detail::ELogType type = detail::ELogType::None, const char* func = nullptr);
diff --git a/UnleashedRecomp/os/win32/logger_win32.cpp b/UnleashedRecomp/os/win32/logger_win32.cpp
index f606da7..5bd13f9 100644
--- a/UnleashedRecomp/os/win32/logger_win32.cpp
+++ b/UnleashedRecomp/os/win32/logger_win32.cpp
@@ -7,11 +7,6 @@ HANDLE g_hStandardOutput = nullptr;
 
 void os::logger::detail::Log(const std::string& str, detail::ELogType type, const char* func)
 {
-#if !_DEBUG
-    if (type == ELogType::Utility)
-        return;
-#endif
-
     if (!g_hStandardOutput)
         g_hStandardOutput = GetStdHandle(STD_OUTPUT_HANDLE);