diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index b8c7162114..967b6ac9ad 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -663,6 +663,7 @@
+
@@ -1278,6 +1279,7 @@
+
diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt
index 99915a0023..46f1955524 100644
--- a/Source/Core/VideoCommon/CMakeLists.txt
+++ b/Source/Core/VideoCommon/CMakeLists.txt
@@ -64,6 +64,8 @@ add_library(videocommon
GeometryShaderManager.h
GraphicsModSystem/Config/GraphicsMod.cpp
GraphicsModSystem/Config/GraphicsMod.h
+ GraphicsModSystem/Config/GraphicsModAsset.cpp
+ GraphicsModSystem/Config/GraphicsModAsset.h
GraphicsModSystem/Config/GraphicsModFeature.cpp
GraphicsModSystem/Config/GraphicsModFeature.h
GraphicsModSystem/Config/GraphicsModGroup.cpp
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
index c7dc5aab87..b04190ad67 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.cpp
@@ -178,6 +178,27 @@ bool GraphicsModConfig::DeserializeFromConfig(const picojson::value& value)
}
}
+ const auto& assets = value.get("assets");
+ if (assets.is())
+ {
+ for (const auto& asset_val : assets.get())
+ {
+ if (!asset_val.is())
+ {
+ ERROR_LOG_FMT(
+ VIDEO, "Failed to load mod configuration file, specified asset is not a json object");
+ return false;
+ }
+ GraphicsModAssetConfig asset;
+ if (!asset.DeserializeFromConfig(asset_val.get()))
+ {
+ return false;
+ }
+
+ m_assets.push_back(std::move(asset));
+ }
+ }
+
return true;
}
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.h b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.h
index f4f6859cb3..953af6201b 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsMod.h
@@ -9,6 +9,7 @@
#include
+#include "VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h"
#include "VideoCommon/GraphicsModSystem/Config/GraphicsModFeature.h"
#include "VideoCommon/GraphicsModSystem/Config/GraphicsTargetGroup.h"
@@ -30,6 +31,7 @@ struct GraphicsModConfig
std::vector m_groups;
std::vector m_features;
+ std::vector m_assets;
static std::optional Create(const std::string& file, Source source);
static std::optional Create(const picojson::object* obj);
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.cpp
new file mode 100644
index 0000000000..fb5572b3da
--- /dev/null
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.cpp
@@ -0,0 +1,52 @@
+// Copyright 2023 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h"
+
+#include "Common/Logging/Log.h"
+
+bool GraphicsModAssetConfig::DeserializeFromConfig(const picojson::object& obj)
+{
+ auto name_iter = obj.find("name");
+ if (name_iter == obj.end())
+ {
+ ERROR_LOG_FMT(VIDEO, "Failed to load mod configuration file, specified asset has no name");
+ return false;
+ }
+ if (!name_iter->second.is())
+ {
+ ERROR_LOG_FMT(VIDEO, "Failed to load mod configuration file, specified asset has a name "
+ "that is not a string");
+ return false;
+ }
+ m_name = name_iter->second.to_str();
+
+ auto data_iter = obj.find("data");
+ if (data_iter == obj.end())
+ {
+ ERROR_LOG_FMT(VIDEO, "Failed to load mod configuration file, specified asset '{}' has no data",
+ m_name);
+ return false;
+ }
+ if (!data_iter->second.is())
+ {
+ ERROR_LOG_FMT(VIDEO,
+ "Failed to load mod configuration file, specified asset '{}' has data "
+ "that is not an object",
+ m_name);
+ return false;
+ }
+ for (const auto& [key, value] : data_iter->second.get())
+ {
+ if (!value.is())
+ {
+ ERROR_LOG_FMT(VIDEO,
+ "Failed to load mod configuration file, specified asset '{}' has data "
+ "with a value for key '{}' that is not a string",
+ m_name, key);
+ }
+ m_map[key] = value.to_str();
+ }
+
+ return true;
+}
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h
new file mode 100644
index 0000000000..b38ba792cc
--- /dev/null
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h
@@ -0,0 +1,18 @@
+// Copyright 2023 Dolphin Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include
+
+#include
+
+#include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
+
+struct GraphicsModAssetConfig
+{
+ std::string m_name;
+ VideoCommon::DirectFilesystemAssetLibrary::AssetMap m_map;
+
+ bool DeserializeFromConfig(const picojson::object& obj);
+};
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h
index 6de0af8afe..4760da3124 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/Actions/CustomPipelineAction.h
@@ -26,8 +26,9 @@ public:
std::string m_pixel_material_asset;
};
- static std::unique_ptr Create(const picojson::value& json_data,
- std::string_view path);
+ static std::unique_ptr
+ Create(const picojson::value& json_data,
+ std::shared_ptr library);
CustomPipelineAction(std::shared_ptr library,
std::vector pass_descriptions);
~CustomPipelineAction();
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp
index 4055265e5a..6ff64aa038 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.cpp
@@ -12,7 +12,7 @@
namespace GraphicsModActionFactory
{
std::unique_ptr Create(std::string_view name, const picojson::value& json_data,
- std::string_view path)
+ std::shared_ptr library)
{
if (name == "print")
{
@@ -32,7 +32,7 @@ std::unique_ptr Create(std::string_view name, const picojson:
}
else if (name == "custom_pipeline")
{
- return CustomPipelineAction::Create(json_data, path);
+ return CustomPipelineAction::Create(json_data, std::move(library));
}
return nullptr;
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h
index 7709d75617..069533d6d1 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h
@@ -8,10 +8,11 @@
#include
+#include "VideoCommon/Assets/CustomAssetLibrary.h"
#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModAction.h"
namespace GraphicsModActionFactory
{
std::unique_ptr Create(std::string_view name, const picojson::value& json_data,
- std::string_view path);
+ std::shared_ptr library);
}
diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
index 3e4cd6e4e6..0d2f0fe347 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.cpp
@@ -13,7 +13,9 @@
#include "Core/ConfigManager.h"
+#include "VideoCommon/Assets/DirectFilesystemAssetLibrary.h"
#include "VideoCommon/GraphicsModSystem/Config/GraphicsMod.h"
+#include "VideoCommon/GraphicsModSystem/Config/GraphicsModAsset.h"
#include "VideoCommon/GraphicsModSystem/Config/GraphicsModGroup.h"
#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionFactory.h"
#include "VideoCommon/TextureInfo.h"
@@ -187,6 +189,8 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
const auto& mods = config.GetMods();
+ auto filesystem_library = std::make_shared();
+
std::map> group_to_targets;
for (const auto& mod : mods)
{
@@ -208,6 +212,29 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
group_to_targets[internal_group].push_back(target);
}
}
+
+ std::string base_path;
+ SplitPath(mod.GetAbsolutePath(), &base_path, nullptr, nullptr);
+ for (const GraphicsModAssetConfig& asset : mod.m_assets)
+ {
+ auto asset_map = asset.m_map;
+ for (auto& [k, v] : asset_map)
+ {
+ if (v.is_absolute())
+ {
+ WARN_LOG_FMT(VIDEO,
+ "Specified graphics mod asset '{}' for mod '{}' has an absolute path, you "
+ "shouldn't release this to users.",
+ asset.m_name, mod.m_title);
+ }
+ else
+ {
+ v = std::filesystem::path{base_path} / v;
+ }
+ }
+
+ filesystem_library->SetAssetIDMapData(asset.m_name, std::move(asset_map));
+ }
}
for (const auto& mod : mods)
@@ -215,12 +242,11 @@ void GraphicsModManager::Load(const GraphicsModGroupConfig& config)
for (const GraphicsModFeatureConfig& feature : mod.m_features)
{
const auto create_action =
- [](const std::string_view& action_name, const picojson::value& json_data,
- GraphicsModConfig mod_config) -> std::unique_ptr {
- std::string base_path;
- SplitPath(mod_config.GetAbsolutePath(), &base_path, nullptr, nullptr);
-
- auto action = GraphicsModActionFactory::Create(action_name, json_data, base_path);
+ [filesystem_library](const std::string_view& action_name,
+ const picojson::value& json_data,
+ GraphicsModConfig mod_config) -> std::unique_ptr {
+ auto action =
+ GraphicsModActionFactory::Create(action_name, json_data, std::move(filesystem_library));
if (action == nullptr)
{
return nullptr;