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

VideoCommon: Remove a workaround mutex used for SOIL

This commit is contained in:
Emmanuel Gil Peyrot 2016-12-27 18:15:33 +01:00 committed by JosJuice
parent 17e65a7167
commit 6d0143647e
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,7 +42,6 @@ struct DiskTexture
static std::unordered_map<std::string, DiskTexture> s_textureMap; static std::unordered_map<std::string, DiskTexture> s_textureMap;
static std::unordered_map<std::string, std::shared_ptr<HiresTexture>> s_textureCache; static std::unordered_map<std::string, std::shared_ptr<HiresTexture>> s_textureCache;
static std::mutex s_textureCacheMutex; static std::mutex s_textureCacheMutex;
static std::mutex s_textureCacheAquireMutex; // for high priority access
static Common::Flag s_textureCacheAbortLoading; static Common::Flag s_textureCacheAbortLoading;
static std::thread s_prefetcher; static std::thread s_prefetcher;
@ -148,25 +147,16 @@ void HiresTexture::Prefetch()
if (base_filename.find("_mip") == std::string::npos) if (base_filename.find("_mip") == std::string::npos)
{ {
{
// try to get this mutex first, so the video thread is allow to get the real mutex faster
std::unique_lock<std::mutex> lk(s_textureCacheAquireMutex);
}
std::unique_lock<std::mutex> lk(s_textureCacheMutex); std::unique_lock<std::mutex> lk(s_textureCacheMutex);
auto iter = s_textureCache.find(base_filename); auto iter = s_textureCache.find(base_filename);
if (iter == s_textureCache.end()) if (iter == s_textureCache.end())
{ {
// unlock while loading a texture. This may result in a race condition where we'll load a // unlock while loading a texture. This may result in a race condition where
// texture twice, // we'll load a texture twice, but it reduces the stuttering a lot.
// but it reduces the stuttering a lot. Notice: The loading library _must_ be thread safe lk.unlock();
// now.
// But bad luck, SOIL isn't, so TODO: remove SOIL usage here and use libpng directly
// Also TODO: remove s_textureCacheAquireMutex afterwards. It won't be needed as the main
// mutex will be locked rarely
// lk.unlock();
std::unique_ptr<HiresTexture> texture = Load(base_filename, 0, 0); std::unique_ptr<HiresTexture> texture = Load(base_filename, 0, 0);
// lk.lock(); lk.lock();
if (texture) if (texture)
{ {
std::shared_ptr<HiresTexture> ptr(std::move(texture)); std::shared_ptr<HiresTexture> ptr(std::move(texture));
@ -297,7 +287,6 @@ std::shared_ptr<HiresTexture> HiresTexture::Search(const u8* texture, size_t tex
std::string base_filename = std::string base_filename =
GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps); GenBaseName(texture, texture_size, tlut, tlut_size, width, height, format, has_mipmaps);
std::lock_guard<std::mutex> lk2(s_textureCacheAquireMutex);
std::lock_guard<std::mutex> lk(s_textureCacheMutex); std::lock_guard<std::mutex> lk(s_textureCacheMutex);
auto iter = s_textureCache.find(base_filename); auto iter = s_textureCache.find(base_filename);