diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-10-10 17:11:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-10 17:11:03 +0200 |
| commit | a2f21da87723adfa09c8a733c2245975dbd78793 (patch) | |
| tree | 68b2ea7ddcff5beda8c1b3f02ef55e3d8e5e369d /Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp | |
| parent | 1b7a590b4bb7d34152178e4768d453b40a4118ff (diff) | |
| parent | 0e8f8ea930d4b635fd7287f572dc2911996638bf (diff) | |
Merge pull request #12167 from iwubcode/use_texture_data_for_texture_assets
VideoCommon: use 'TextureData' for texture assets to support texture metadata
Diffstat (limited to 'Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp index f579a5eb4b..134b18b496 100644 --- a/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp +++ b/Source/Core/VideoCommon/Assets/CustomAssetLoader.cpp @@ -77,13 +77,6 @@ void CustomAssetLoader ::Shutdown() m_total_bytes_loaded = 0; } -std::shared_ptr<RawTextureAsset> -CustomAssetLoader::LoadTexture(const CustomAssetLibrary::AssetID& asset_id, - std::shared_ptr<CustomAssetLibrary> library) -{ - return LoadOrCreateAsset<RawTextureAsset>(asset_id, m_textures, std::move(library)); -} - std::shared_ptr<GameTextureAsset> CustomAssetLoader::LoadGameTexture(const CustomAssetLibrary::AssetID& asset_id, std::shared_ptr<CustomAssetLibrary> library) |