diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp index 07f00624e4..374b138571 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.cpp @@ -187,6 +187,16 @@ std::optional DeserializeTargetFromConfig(const picojson:: target.m_texture_info_string = texture_info.value(); return target; } + else if (type == "create_texture") + { + std::optional texture_info = ExtractTextureFilenameForConfig(obj); + if (!texture_info.has_value()) + return std::nullopt; + + CreateTextureTarget target; + target.m_texture_info_string = texture_info.value(); + return target; + } else if (type == "efb") { return DeserializeFBTargetFromConfig(obj, EFB_DUMP_PREFIX); diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.h b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.h index 67a349e78f..bde445258c 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsTarget.h @@ -26,6 +26,10 @@ struct LoadTextureTarget final : public TextureTarget { }; +struct CreateTextureTarget final : public TextureTarget +{ +}; + struct FBTarget { u32 m_height = 0; @@ -47,8 +51,9 @@ struct ProjectionTarget ProjectionType m_projection_type = ProjectionType::Perspective; }; -using GraphicsTargetConfig = std::variant; +using GraphicsTargetConfig = + std::variant; std::optional DeserializeTargetFromConfig(const picojson::object& obj); diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h index a7b366122d..04a371a73e 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h @@ -21,5 +21,6 @@ public: virtual void OnProjection(GraphicsModActionData::Projection*) {} virtual void OnProjectionAndTexture(GraphicsModActionData::Projection*) {} virtual void OnTextureLoad(GraphicsModActionData::TextureLoad*) {} + virtual void OnTextureCreate(GraphicsModActionData::TextureCreate*) {} virtual void OnFrameEnd() {} }; diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h index 14f2e3a9b3..48de0e5368 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h @@ -32,4 +32,7 @@ struct TextureLoad { std::string_view texture_name; }; +struct TextureCreate +{ +}; } // namespace GraphicsModActionData diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp index 3f1cea1b80..3e4cd6e4e6 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp @@ -58,6 +58,12 @@ public: return; m_action_impl->OnTextureLoad(texture_load); } + void OnTextureCreate(GraphicsModActionData::TextureCreate* texture_create) override + { + if (!m_mod.m_enabled) + return; + m_action_impl->OnTextureCreate(texture_create); + } void OnFrameEnd() override { if (!m_mod.m_enabled) @@ -143,6 +149,18 @@ GraphicsModManager::GetTextureLoadActions(const std::string& texture_name) const return m_default; } +const std::vector& +GraphicsModManager::GetTextureCreateActions(const std::string& texture_name) const +{ + if (const auto it = m_create_texture_target_to_actions.find(texture_name); + it != m_create_texture_target_to_actions.end()) + { + return it->second; + } + + return m_default; +} + const std::vector& GraphicsModManager::GetEFBActions(const FBInfo& efb) const { if (const auto it = m_efb_target_to_actions.find(efb); it != m_efb_target_to_actions.end()) @@ -223,6 +241,10 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config) m_load_texture_target_to_actions[the_target.m_texture_info_string].push_back( m_actions.back().get()); }, + [&](const CreateTextureTarget& the_target) { + m_create_texture_target_to_actions[the_target.m_texture_info_string].push_back( + m_actions.back().get()); + }, [&](const EFBTarget& the_target) { FBInfo info; info.m_height = the_target.m_height; @@ -315,6 +337,7 @@ void GraphicsModManager::Reset() m_projection_texture_target_to_actions.clear(); m_draw_started_target_to_actions.clear(); m_load_texture_target_to_actions.clear(); + m_create_texture_target_to_actions.clear(); m_efb_target_to_actions.clear(); m_xfb_target_to_actions.clear(); } diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h index ed0063444a..2d67b4db76 100644 --- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h +++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h @@ -30,6 +30,8 @@ public: GetDrawStartedActions(const std::string& texture_name) const; const std::vector& GetTextureLoadActions(const std::string& texture_name) const; + const std::vector& + GetTextureCreateActions(const std::string& texture_name) const; const std::vector& GetEFBActions(const FBInfo& efb) const; const std::vector& GetXFBActions(const FBInfo& xfb) const; @@ -49,6 +51,8 @@ private: m_projection_texture_target_to_actions; std::unordered_map> m_draw_started_target_to_actions; std::unordered_map> m_load_texture_target_to_actions; + std::unordered_map> + m_create_texture_target_to_actions; std::unordered_map, FBInfoHasher> m_efb_target_to_actions; std::unordered_map, FBInfoHasher> m_xfb_target_to_actions;