piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 22:29:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: prevent potential data issue when reloading Asset data that could happen due to the asset loading thread reloading data while another thread is working with it

Browse Source
This commit is contained in:
iwubcode
2023-06-02 23:57:32 -05:00
parent d03e09c8fd
commit 58d383b30b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/VideoCommon/Assets/CustomAsset.h
View File

@ -64,7 +64,11 @@ class CustomLoadableAsset : public CustomAsset
public:
using CustomAsset::CustomAsset;
const UnderlyingType* GetData() const
// Callees should understand that the type returned is
// a local copy and 'GetData()' needs to be called
// to ensure the latest copy is available if
// they want to handle reloads
[[nodiscard]] std::shared_ptr<UnderlyingType> GetData() const
{
std::lock_guard lk(m_lock);
if (m_loaded)
@ -75,7 +79,7 @@ public:
protected:
bool m_loaded = false;
mutable std::mutex m_lock;
UnderlyingType m_data;
std::shared_ptr<UnderlyingType> m_data;
};
} // namespace VideoCommon