ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11862 from iwubcode/avoid_duplicate_action_creation 

VideoCommon: don't create an action per target in graphics mods
This commit is contained in:
Admiral H. Curtiss 2023-05-30 11:33:16 +02:00 committed by GitHub
parent da77084d2f bbf3efb17d
commit 356792cc20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
View File

@ -212,16 +212,7 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
const auto internal_group = fmt::format("{}.{}", mod.m_title, feature.m_group); const auto internal_group = fmt::format("{}.{}", mod.m_title, feature.m_group);
const auto add_target = [&](const GraphicsTargetConfig& target, const auto add_target = [&](const GraphicsTargetConfig& target) {
GraphicsModConfig mod_config) {
auto action = create_action(feature.m_action, feature.m_action_data, std::move(mod_config));
if (action == nullptr)
{
WARN_LOG_FMT(VIDEO, "Failed to create action '{}' for group '{}'.", feature.m_action,
feature.m_group);
return;
}
m_actions.push_back(std::move(action));
std::visit( std::visit(
overloaded{ overloaded{
[&](const DrawStartedTextureTarget& the_target) { [&](const DrawStartedTextureTarget& the_target) {
@ -264,21 +255,34 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
target); target);
}; };
const auto add_action = [&](GraphicsModConfig mod_config) {
auto action = create_action(feature.m_action, feature.m_action_data, std::move(mod_config));
if (action == nullptr)
{
WARN_LOG_FMT(VIDEO, "Failed to create action '{}' for group '{}'.", feature.m_action,
feature.m_group);
return;
}
m_actions.push_back(std::move(action));
};
// Prefer groups in the pack over groups from another pack // Prefer groups in the pack over groups from another pack
if (const auto local_it = group_to_targets.find(internal_group); if (const auto local_it = group_to_targets.find(internal_group);
local_it != group_to_targets.end()) local_it != group_to_targets.end())
{ {
add_action(mod);
for (const GraphicsTargetConfig& target : local_it->second) for (const GraphicsTargetConfig& target : local_it->second)
{ {
add_target(target, mod); add_target(target);
} }
} }
else if (const auto global_it = group_to_targets.find(feature.m_group); else if (const auto global_it = group_to_targets.find(feature.m_group);
global_it != group_to_targets.end()) global_it != group_to_targets.end())
{ {
add_action(mod);
for (const GraphicsTargetConfig& target : global_it->second) for (const GraphicsTargetConfig& target : global_it->second)
{ {
add_target(target, mod); add_target(target);
} }
} }
else else