ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

VideoCommon: Join the prefetch thread before clearing to avoid a potential crash that can occur by multiple threads touching a single resource

This commit is contained in:
iwubcode 2021-02-02 23:02:41 -06:00
parent 0f29e36440
commit 0a9c764dc4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/HiresTextures.cpp
View File

@ -56,14 +56,7 @@ void HiresTexture::Init()
void HiresTexture::Shutdown() void HiresTexture::Shutdown()
{ {
if (s_prefetcher.joinable()) Clear();
{
s_textureCacheAbortLoading.Set();
s_prefetcher.join();
}
s_textureMap.clear();
s_textureCache.clear();
} }
void HiresTexture::Update() void HiresTexture::Update()
@ -147,6 +140,11 @@ void HiresTexture::Update()
void HiresTexture::Clear() void HiresTexture::Clear()
{ {
if (s_prefetcher.joinable())
{
s_textureCacheAbortLoading.Set();
s_prefetcher.join();
}
s_textureMap.clear(); s_textureMap.clear();
s_textureCache.clear(); s_textureCache.clear();
} }