diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-07-09 21:49:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-09 21:49:16 +0200 |
| commit | fe8a9ac70796498e8bc5b29770e9334ed187c35d (patch) | |
| tree | d70210185ba889c5f45b055b29b351fa4b7c6d1a /Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp | |
| parent | bd90f6be78ffa40c07542c43b74a17f0951f10eb (diff) | |
| parent | 77511e8e7cc80cc82fa1edf206948f714413aac8 (diff) | |
Merge pull request #12024 from iwubcode/material_asset
VideoCommon: add material asset
Diffstat (limited to 'Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp index ce76a368d2..f579a5eb4b 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp @@ -97,4 +97,11 @@ CustomAssetLoader::LoadPixelShader(const CustomAssetLibrary::AssetID& asset_id, { return LoadOrCreateAsset<PixelShaderAsset>(asset_id, m_pixel_shaders, std::move(library)); } + +std::shared_ptr<MaterialAsset> +CustomAssetLoader::LoadMaterial(const CustomAssetLibrary::AssetID& asset_id, + std::shared_ptr<CustomAssetLibrary> library) +{ + return LoadOrCreateAsset<MaterialAsset>(asset_id, m_materials, std::move(library)); +} } // namespace VideoCommon |
