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/DirectFilesystemAssetLibrary.h | |
| 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/DirectFilesystemAssetLibrary.h')
| -rw-r--r-- | Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h index 21c5ce7d54..244b49c88b 100644 --- a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h +++ b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h @@ -20,7 +20,7 @@ class DirectFilesystemAssetLibrary final : public CustomAssetLibrary public: using AssetMap = std::map<std::string, std::filesystem::path>; - LoadInfo LoadTexture(const AssetID& asset_id, CustomTextureData* data) override; + LoadInfo LoadTexture(const AssetID& asset_id, TextureData* data) override; LoadInfo LoadPixelShader(const AssetID& asset_id, PixelShaderData* data) override; LoadInfo LoadMaterial(const AssetID& asset_id, MaterialData* data) override; |