Split out everying remaining from Swap

2 files changed, 6 insertions, 2 deletions

diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
index 4b5f5dbd84..368e7adba4 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
@@ -85,6 +85,8 @@ bool GraphicsModManager::Initialize()
     g_ActiveConfig.graphics_mod_config->Load();
     g_ActiveConfig.graphics_mod_config->SetChangeCount(old_game_mod_changes);
     g_graphics_mod_manager->Load(*g_ActiveConfig.graphics_mod_config);
+
+    m_end_of_frame_event = AfterFrameEvent::Register([this] { EndOfFrame(); }, "ModManager");
   }
 
   return true;
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
index 035ee48a36..aeb55f17d1 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h
@@ -14,6 +14,7 @@
 #include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h"
 #include "VideoCommon/TextureInfo.h"
 #include "VideoCommon/XFMemory.h"
+#include "VideoCommon/VideoEvents.h"
 
 class GraphicsModGroupConfig;
 class GraphicsModManager
@@ -34,9 +35,8 @@ public:
 
   void Load(const GraphicsModGroupConfig& config);
 
-  void EndOfFrame();
-
 private:
+  void EndOfFrame();
   void Reset();
 
   class DecoratedAction;
@@ -53,6 +53,8 @@ private:
   std::unordered_map<FBInfo, std::vector<GraphicsModAction*>, FBInfoHasher> m_xfb_target_to_actions;
 
   std::unordered_set<std::string> m_groups;
+
+  EventHook m_end_of_frame_event;
 };
 
 extern std::unique_ptr<GraphicsModManager> g_graphics_mod_manager;