mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-29 13:45:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Options: merge SCoreStartupParameter into SConfig

Browse source
This commit is contained in:
degasus 2015-06-12 13:56:53 +02:00
commit c375111076
114 changed files with 1100 additions and 1163 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/VideoCommon/HiresTextures.cpp
View file

@ -80,7 +80,7 @@ void HiresTexture::Update()
}
std::vector<std::string> Directories;
const std::string& gameCode = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
const std::string& gameCode = SConfig::GetInstance().m_strUniqueID;
std::string szDir = StringFromFormat("%s%s", File::GetUserPath(D_HIRESTEXTURES_IDX).c_str(), gameCode.c_str());
@ -206,7 +206,7 @@ std::string HiresTexture::GenBaseName(const u8* texture, size_t texture_size, co
// try to load the old format first
u64 tex_hash = GetHashHiresTexture(texture, (int)texture_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
u64 tlut_hash = tlut_size ? GetHashHiresTexture(tlut, (int)tlut_size, g_ActiveConfig.iSafeTextureCache_ColorSamples) : 0;
name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(), (u32)(tex_hash ^ tlut_hash), (u16)format);
name = StringFromFormat("%s_%08x_%i", SConfig::GetInstance().m_strUniqueID.c_str(), (u32)(tex_hash ^ tlut_hash), (u16)format);
if (s_textureMap.find(name) != s_textureMap.end())
{
if (g_ActiveConfig.bConvertHiresTextures)