diff --git a/Source/Core/Common/Hash.cpp b/Source/Core/Common/Hash.cpp index f9a3737d34..973e30da02 100644 --- a/Source/Core/Common/Hash.cpp +++ b/Source/Core/Common/Hash.cpp @@ -510,19 +510,15 @@ u64 GetHash64(const u8 *src, int len, u32 samples) } // sets the hash function used for the texture cache -void SetHash64Function(bool useHiresTextures) +void SetHash64Function() { - if (useHiresTextures) - { - ptrHashFunction = &GetHashHiresTexture; - } #if _M_SSE >= 0x402 - else if (cpu_info.bSSE4_2 && !useHiresTextures) // sse crc32 version + if (cpu_info.bSSE4_2) // sse crc32 version { ptrHashFunction = &GetCRC32; } -#endif else +#endif { ptrHashFunction = &GetMurmurHash3; } diff --git a/Source/Core/Common/Hash.h b/Source/Core/Common/Hash.h index bcaa687e8c..841a10386b 100644 --- a/Source/Core/Common/Hash.h +++ b/Source/Core/Common/Hash.h @@ -16,4 +16,4 @@ u64 GetCRC32(const u8 *src, int len, u32 samples); // SSE4.2 version of CRC32 u64 GetHashHiresTexture(const u8 *src, int len, u32 samples); u64 GetMurmurHash3(const u8 *src, int len, u32 samples); u64 GetHash64(const u8 *src, int len, u32 samples); -void SetHash64Function(bool useHiresTextures); +void SetHash64Function(); diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 3d9ea0c99d..5654fb1fa9 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -62,7 +62,7 @@ TextureCache::TextureCache() if (g_ActiveConfig.bHiresTextures && !g_ActiveConfig.bDumpTextures) HiresTexture::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID); - SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); + SetHash64Function(); invalidate_texture_cache_requested = false; } @@ -110,7 +110,6 @@ void TextureCache::OnConfigChanged(VideoConfig& config) if (g_ActiveConfig.bHiresTextures) HiresTexture::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID); - SetHash64Function(g_ActiveConfig.bHiresTextures || g_ActiveConfig.bDumpTextures); TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter); invalidate_texture_cache_requested = false;