Reduce useless log spam

praydog · Jun 23, 2023 · c6d8c7f · c6d8c7f
1 parent aeb16f1
commit c6d8c7f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/mods/vr/D3D11Component.cpp b/src/mods/vr/D3D11Component.cpp
@@ -12,6 +12,7 @@ namespace pixel_shader1 {
 }
 
 #include <utility/ScopeGuard.hpp>
+#include <utility/Logging.hpp>
 
 #include "Framework.hpp"
 #include "../VR.hpp"
@@ -784,7 +785,7 @@ void D3D11Component::copy_tex(ID3D11Resource* src, ID3D11Resource* dst) {
 }
 
 bool D3D11Component::setup() {
-    spdlog::info("[VR] Setting up D3D11 textures...");
+    SPDLOG_INFO_EVERY_N_SEC(1, "[VR] Setting up D3D11 textures...");
 
     on_reset(VR::get().get());
 
@@ -809,7 +810,7 @@ bool D3D11Component::setup() {
     }
 
     if (backbuffer == nullptr) {
-        spdlog::error("[VR] Failed to get back buffer (D3D11).");
+        SPDLOG_ERROR_EVERY_N_SEC(1, "[VR] Failed to get back buffer (D3D11).");
         return false;
     }
 

diff --git a/src/mods/vr/D3D12Component.cpp b/src/mods/vr/D3D12Component.cpp
@@ -1,6 +1,7 @@
 #include <openvr.h>
 #include <utility/String.hpp>
 #include <utility/ScopeGuard.hpp>
+#include <utility/Logging.hpp>
 
 #include "Framework.hpp"
 #include "../VR.hpp"
@@ -820,7 +821,7 @@ void D3D12Component::on_reset(VR* vr) {
 }
 
 bool D3D12Component::setup() {
-    spdlog::info("[VR] Setting up d3d12 textures...");
+    SPDLOG_INFO_EVERY_N_SEC(1, "[VR] Setting up d3d12 textures...");
 
     auto vr = VR::get();
     on_reset(vr.get());
@@ -841,7 +842,7 @@ bool D3D12Component::setup() {
     }
 
     if (backbuffer == nullptr) {
-        spdlog::error("[VR] Failed to get back buffer (D3D12).");
+        SPDLOG_ERROR_EVERY_N_SEC(1, "[VR] Failed to get back buffer (D3D12).");
         return false;
     }
 
@@ -851,7 +852,7 @@ bool D3D12Component::setup() {
 
     ComPtr<ID3D12Resource> real_backbuffer{};
     if (FAILED(swapchain->GetBuffer(0, IID_PPV_ARGS(&real_backbuffer)))) {
-        spdlog::error("[VR] Failed to get back buffer (D3D12).");
+        spdlog::error("[VR] Failed to get real back buffer (D3D12).");
         return false;
     }
 

diff --git a/src/utility/Logging.hpp b/src/utility/Logging.hpp
@@ -1,7 +1,13 @@
 #pragma once
 
+#include <chrono>
+
 #include <spdlog/spdlog.h>
 
 #define SPDLOG_INFO_ONCE(...) {static bool once = true; if (once) { SPDLOG_INFO(__VA_ARGS__); once = false; }}
 #define SPDLOG_WARN_ONCE(...) {static bool once = true; if (once) { SPDLOG_WARN(__VA_ARGS__); once = false; }}
-#define SPDLOG_ERROR_ONCE(...) {static bool once = true; if (once) { SPDLOG_ERROR(__VA_ARGS__); once = false; }}
+#define SPDLOG_ERROR_ONCE(...) {static bool once = true; if (once) { SPDLOG_ERROR(__VA_ARGS__); once = false; }}
+
+#define SPDLOG_INFO_EVERY_N_SEC(n, ...) {static auto last = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now(); if (now - last >= std::chrono::seconds(n)) { SPDLOG_INFO(__VA_ARGS__); last = now; }}
+#define SPDLOG_WARNING_EVERY_N_SEC(n, ...) {static auto last = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now(); if (now - last >= std::chrono::seconds(n)) { SPDLOG_WARN(__VA_ARGS__); last = now; }}
+#define SPDLOG_ERROR_EVERY_N_SEC(n, ...) {static auto last = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now(); if (now - last >= std::chrono::seconds(n)) { SPDLOG_ERROR(__VA_ARGS__); last = now; }}