From cac66317aa715a3d9fcfe39ccbe5d224ca489637 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 31 Jan 2024 13:12:06 -0500 Subject: VideoCommon/Statistics: Remove global system accessor from s_after_frame_event Instead, we make the event take a reference to the system and then pass it in when the event is triggered. This does introduce two other accessors, but these are much easier to refactor out over time, and without modification to the existing event interface. --- .../Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp | 4 ++-- .../Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/GraphicsModSystem/Runtime') diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp index cd871b5833..de68bffa63 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/CustomShaderCache.cpp @@ -16,8 +16,8 @@ CustomShaderCache::CustomShaderCache() m_async_uber_shader_compiler = g_gfx->CreateAsyncShaderCompiler(); m_async_uber_shader_compiler->StartWorkerThreads(1); // TODO - m_frame_end_handler = - AfterFrameEvent::Register([this] { RetrieveAsyncShaders(); }, "RetreiveAsyncShaders"); + m_frame_end_handler = AfterFrameEvent::Register([this](Core::System&) { RetrieveAsyncShaders(); }, + "RetrieveAsyncShaders"); } CustomShaderCache::~CustomShaderCache() diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp index 01e7a07033..4ddd2d1d72 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp @@ -95,7 +95,8 @@ bool GraphicsModManager::Initialize() 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"); + m_end_of_frame_event = + AfterFrameEvent::Register([this](Core::System&) { EndOfFrame(); }, "ModManager"); } return true; -- cgit v1.2.3