mirror of
https://github.com/izzy2lost/dolphin.git
synced 2026-06-19 01:16:48 -07:00
Common: Remove the string parameters from the HookableEvent interface.
This commit is contained in:
@@ -18,8 +18,8 @@ std::unique_ptr<AbstractGfx> g_gfx;
|
||||
|
||||
AbstractGfx::AbstractGfx()
|
||||
{
|
||||
m_config_changed = GetVideoEvents().config_changed_event.Register(
|
||||
[this](u32 bits) { OnConfigChanged(bits); }, "AbstractGfx");
|
||||
m_config_changed =
|
||||
GetVideoEvents().config_changed_event.Register([this](u32 bits) { OnConfigChanged(bits); });
|
||||
}
|
||||
|
||||
bool AbstractGfx::IsHeadless() const
|
||||
|
||||
@@ -29,8 +29,8 @@ void CustomResourceManager::Initialize()
|
||||
|
||||
m_asset_loader.Initialize();
|
||||
|
||||
m_xfb_event = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { XFBTriggered(); }, "CustomResourceManager");
|
||||
m_xfb_event =
|
||||
GetVideoEvents().after_frame_event.Register([this](Core::System&) { XFBTriggered(); });
|
||||
}
|
||||
|
||||
void CustomResourceManager::Shutdown()
|
||||
|
||||
@@ -29,8 +29,8 @@ static bool DumpFrameToPNG(const FrameData& frame, const std::string& file_name)
|
||||
|
||||
FrameDumper::FrameDumper()
|
||||
{
|
||||
m_frame_end_handle = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { FlushFrameDump(); }, "FrameDumper");
|
||||
m_frame_end_handle =
|
||||
GetVideoEvents().after_frame_event.Register([this](Core::System&) { FlushFrameDump(); });
|
||||
}
|
||||
|
||||
FrameDumper::~FrameDumper()
|
||||
|
||||
@@ -84,8 +84,8 @@ bool FramebufferManager::Initialize()
|
||||
return false;
|
||||
}
|
||||
|
||||
m_end_of_frame_event = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { EndOfFrame(); }, "FramebufferManager");
|
||||
m_end_of_frame_event =
|
||||
GetVideoEvents().after_frame_event.Register([this](Core::System&) { EndOfFrame(); });
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@ CustomShaderCache::CustomShaderCache()
|
||||
m_async_uber_shader_compiler->StartWorkerThreads(1); // TODO
|
||||
|
||||
m_frame_end_handler = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { RetrieveAsyncShaders(); }, "RetrieveAsyncShaders");
|
||||
[this](Core::System&) { RetrieveAsyncShaders(); });
|
||||
}
|
||||
|
||||
CustomShaderCache::~CustomShaderCache()
|
||||
|
||||
@@ -95,8 +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 = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { EndOfFrame(); }, "ModManager");
|
||||
m_end_of_frame_event =
|
||||
GetVideoEvents().after_frame_event.Register([this](Core::System&) { EndOfFrame(); });
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -94,8 +94,8 @@ static void TryToSnapToXFBSize(int& width, int& height, int xfb_width, int xfb_h
|
||||
|
||||
Presenter::Presenter()
|
||||
{
|
||||
m_config_changed = GetVideoEvents().config_changed_event.Register(
|
||||
[this](u32 bits) { ConfigChanged(bits); }, "Presenter");
|
||||
m_config_changed =
|
||||
GetVideoEvents().config_changed_event.Register([this](u32 bits) { ConfigChanged(bits); });
|
||||
}
|
||||
|
||||
Presenter::~Presenter()
|
||||
|
||||
@@ -47,7 +47,7 @@ bool ShaderCache::Initialize()
|
||||
|
||||
m_async_shader_compiler = g_gfx->CreateAsyncShaderCompiler();
|
||||
m_frame_end_handler = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { RetrieveAsyncShaders(); }, "RetrieveAsyncShaders");
|
||||
[this](Core::System&) { RetrieveAsyncShaders(); });
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -500,18 +500,15 @@ void Statistics::DisplayScissor()
|
||||
|
||||
void Statistics::Init()
|
||||
{
|
||||
s_before_frame_event = GetVideoEvents().before_frame_event.Register([] { g_stats.ResetFrame(); },
|
||||
"Statistics::ResetFrame");
|
||||
s_before_frame_event = GetVideoEvents().before_frame_event.Register([] { g_stats.ResetFrame(); });
|
||||
|
||||
s_after_frame_event = GetVideoEvents().after_frame_event.Register(
|
||||
[](const Core::System& system) {
|
||||
DolphinAnalytics::Instance().ReportPerformanceInfo({
|
||||
.speed_ratio = system.GetSystemTimers().GetEstimatedEmulationPerformance(),
|
||||
.num_prims = g_stats.this_frame.num_prims + g_stats.this_frame.num_dl_prims,
|
||||
.num_draw_calls = g_stats.this_frame.num_draw_calls,
|
||||
});
|
||||
},
|
||||
"Statistics::PerformanceSample");
|
||||
s_after_frame_event = GetVideoEvents().after_frame_event.Register([](const Core::System& system) {
|
||||
DolphinAnalytics::Instance().ReportPerformanceInfo({
|
||||
.speed_ratio = system.GetSystemTimers().GetEstimatedEmulationPerformance(),
|
||||
.num_prims = g_stats.this_frame.num_prims + g_stats.this_frame.num_dl_prims,
|
||||
.num_draw_calls = g_stats.this_frame.num_draw_calls,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
void Statistics::Shutdown()
|
||||
|
||||
@@ -463,8 +463,8 @@ private:
|
||||
|
||||
void OnFrameEnd();
|
||||
|
||||
Common::EventHook m_frame_event = GetVideoEvents().after_frame_event.Register(
|
||||
[this](Core::System&) { OnFrameEnd(); }, "TextureCache");
|
||||
Common::EventHook m_frame_event =
|
||||
GetVideoEvents().after_frame_event.Register([this](Core::System&) { OnFrameEnd(); });
|
||||
|
||||
VideoCommon::TextureUtils::TextureDumper m_texture_dumper;
|
||||
};
|
||||
|
||||
@@ -120,11 +120,10 @@ bool VertexManagerBase::Initialize()
|
||||
{
|
||||
auto& video_events = GetVideoEvents();
|
||||
|
||||
m_frame_end_event = video_events.after_frame_event.Register(
|
||||
[this](Core::System&) { OnEndFrame(); }, "VertexManagerBase");
|
||||
m_frame_end_event =
|
||||
video_events.after_frame_event.Register([this](Core::System&) { OnEndFrame(); });
|
||||
m_after_present_event = video_events.after_present_event.Register(
|
||||
[this](const PresentInfo& pi) { m_ticks_elapsed = pi.emulated_timestamp; },
|
||||
"VertexManagerBase");
|
||||
[this](const PresentInfo& pi) { m_ticks_elapsed = pi.emulated_timestamp; });
|
||||
m_index_generator.Init();
|
||||
m_custom_shader_cache = std::make_unique<CustomShaderCache>();
|
||||
m_cpu_cull.Init();
|
||||
|
||||
@@ -221,8 +221,8 @@ void VideoConfig::VerifyValidity()
|
||||
|
||||
void VideoConfig::Init()
|
||||
{
|
||||
s_check_config_event = GetVideoEvents().after_frame_event.Register(
|
||||
[](Core::System&) { CheckForConfigChanges(); }, "CheckForConfigChanges");
|
||||
s_check_config_event =
|
||||
GetVideoEvents().after_frame_event.Register([](Core::System&) { CheckForConfigChanges(); });
|
||||
}
|
||||
|
||||
void VideoConfig::Shutdown()
|
||||
|
||||
@@ -69,17 +69,17 @@ struct PresentInfo
|
||||
struct VideoEvents
|
||||
{
|
||||
// Called when certain video config setting are changed
|
||||
Common::HookableEvent<u32> config_changed_event{"ConfigChanged"};
|
||||
Common::HookableEvent<u32> config_changed_event;
|
||||
|
||||
// An event called just before the first draw call of a frame
|
||||
Common::HookableEvent<> before_frame_event{"BeforeFrame"};
|
||||
Common::HookableEvent<> before_frame_event;
|
||||
|
||||
// An event called after the frame XFB copy begins processing on the host GPU.
|
||||
// Useful for "once per frame" usecases.
|
||||
// Note: In a few rare cases, games do multiple XFB copies per frame and join them while
|
||||
// presenting.
|
||||
// If this matters to your usecase, you should use BeforePresent instead.
|
||||
Common::HookableEvent<Core::System&> after_frame_event{"AfterFrame"};
|
||||
Common::HookableEvent<Core::System&> after_frame_event;
|
||||
|
||||
// An event called just as a frame is queued for presentation.
|
||||
// The exact timing of this event depends on the "Immediately Present XFB" option.
|
||||
@@ -89,14 +89,14 @@ struct VideoEvents
|
||||
// frame.
|
||||
//
|
||||
// frame_count: The number of frames
|
||||
Common::HookableEvent<PresentInfo&> before_present_event{"BeforePresent"};
|
||||
Common::HookableEvent<PresentInfo&> before_present_event;
|
||||
|
||||
// An event that is triggered after a frame is presented.
|
||||
// The exact timing of this event depends on backend/driver support.
|
||||
Common::HookableEvent<PresentInfo&> after_present_event{"AfterPresent"};
|
||||
Common::HookableEvent<PresentInfo&> after_present_event;
|
||||
|
||||
// An end of frame event that runs on the CPU thread
|
||||
Common::HookableEvent<> vi_end_field_event{"VIEndField"};
|
||||
Common::HookableEvent<> vi_end_field_event;
|
||||
};
|
||||
|
||||
VideoEvents& GetVideoEvents();
|
||||
|
||||
@@ -32,26 +32,24 @@ WidescreenManager::WidescreenManager()
|
||||
auto& system = Core::System::GetInstance();
|
||||
auto& video_events = system.GetVideoEvents();
|
||||
|
||||
m_config_changed = video_events.config_changed_event.Register(
|
||||
[this](u32 bits) {
|
||||
if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO))
|
||||
{
|
||||
// If the widescreen flag isn't being overridden by any settings,
|
||||
// reset it to default if heuristic aren't running or to the last
|
||||
// heuristic value if they were running.
|
||||
if (std::optional<bool> is_game_widescreen = GetWidescreenOverride())
|
||||
m_is_game_widescreen = *is_game_widescreen;
|
||||
else
|
||||
m_is_game_widescreen = (m_heuristic_state == HeuristicState::Active_Found_Anamorphic);
|
||||
}
|
||||
},
|
||||
"Widescreen");
|
||||
m_config_changed = video_events.config_changed_event.Register([this](u32 bits) {
|
||||
if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO))
|
||||
{
|
||||
// If the widescreen flag isn't being overridden by any settings,
|
||||
// reset it to default if heuristic aren't running or to the last
|
||||
// heuristic value if they were running.
|
||||
if (std::optional<bool> is_game_widescreen = GetWidescreenOverride())
|
||||
m_is_game_widescreen = *is_game_widescreen;
|
||||
else
|
||||
m_is_game_widescreen = (m_heuristic_state == HeuristicState::Active_Found_Anamorphic);
|
||||
}
|
||||
});
|
||||
|
||||
// VertexManager doesn't maintain statistics in Wii mode.
|
||||
if (!system.IsWii())
|
||||
{
|
||||
m_update_widescreen = video_events.after_frame_event.Register(
|
||||
[this](Core::System&) { UpdateWidescreenHeuristic(); }, "WideScreen Heuristic");
|
||||
[this](Core::System&) { UpdateWidescreenHeuristic(); });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user