piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 09:59:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: add additional locks around asset access and usage to ensure thread safety

Browse Source
This commit is contained in:
iwubcode
2023-06-04 23:01:29 -05:00
parent ce2b63dcc0
commit 9d7ab47738
7 changed files with 92 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.h
View File

@ -5,6 +5,7 @@
#include <chrono>
#include <filesystem>
#include <map>
#include <mutex>
#include <string>
#include "VideoCommon/Assets/CustomAssetLibrary.h"
@ -18,6 +19,8 @@ class CustomTextureData;
class DirectFilesystemAssetLibrary final : public CustomAssetLibrary
{
public:
using AssetMap = std::map<std::string, std::filesystem::path>;
LoadInfo LoadTexture(const AssetID& asset_id, CustomTextureData* data) override;
// Gets the latest time from amongst all the files in the asset map
@ -26,12 +29,16 @@ public:
// Assigns the asset id to a map of files, how this map is read is dependent on the data
// For instance, a raw texture would expect the map to have a single entry and load that
// file as the asset. But a model file data might have its data spread across multiple files
void SetAssetIDMapData(const AssetID& asset_id,
std::map<std::string, std::filesystem::path> asset_path_map);
void SetAssetIDMapData(const AssetID& asset_id, AssetMap asset_path_map);
private:
// Loads additional mip levels into the texture structure until _mip<N> texture is not found
bool LoadMips(const std::filesystem::path& asset_path, CustomTextureData* data);
// Gets the asset map given an asset id
AssetMap GetAssetMapForID(const AssetID& asset_id) const;
mutable std::mutex m_lock;
std::map<AssetID, std::map<std::string, std::filesystem::path>> m_assetid_to_asset_map_path;
};
} // namespace VideoCommon