mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-19 16:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoCommon: Merge code to generate texture names on dumping

Browse source
This commit is contained in:
degasus 2014-12-22 22:33:38 +01:00
parent 51bfc4c52a
commit f8184858da
4 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/VideoCommon/TextureCacheBase.cpp
View file

@ -263,9 +263,8 @@ void TextureCache::ClearRenderTargets()
}
}
void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level)
void TextureCache::DumpTexture(TCacheEntryBase* entry, std::string basename, unsigned int level)
{
std::string filename;
std::string szDir = File::GetUserPath(D_DUMPTEXTURES_IDX) +
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID;
@ -273,20 +272,11 @@ void TextureCache::DumpTexture(TCacheEntryBase* entry, unsigned int level)
if (!File::Exists(szDir) || !File::IsDirectory(szDir))
File::CreateDir(szDir);
// For compatibility with old texture packs, don't print the LOD index for level 0.
// TODO: TLUT format should actually be stored in filename? :/
if (level == 0)
if (level > 0)
{
filename = StringFromFormat("%s/%s_%08x_%i.png", szDir.c_str(),
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(),
(u32)(entry->hash & 0x00000000FFFFFFFFLL), entry->format & 0xFFFF);
}
else
{
filename = StringFromFormat("%s/%s_%08x_%i_mip%i.png", szDir.c_str(),
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str(),
(u32) (entry->hash & 0x00000000FFFFFFFFLL), entry->format & 0xFFFF, level);
basename += StringFromFormat("_mip%i", level);
}
std::string filename = szDir + "/" + basename + ".png";
if (!File::Exists(filename))
entry->Save(filename, level);
@ -507,8 +497,17 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
else
entry->type = TCET_NORMAL;
std::string basename = "";
if (g_ActiveConfig.bDumpTextures && !hires_tex)
DumpTexture(entry, 0);
{
basename = HiresTexture::GenBaseName(
src_data, texture_size,
&texMem[tlutaddr], palette_size,
width, height,
texformat
);
DumpTexture(entry, basename, 0);
}
u32 level = 1;
// load mips - TODO: Loading mipmaps from tmem is untested!
@ -543,7 +542,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
entry->Load(mip_width, mip_height, expanded_mip_width, level);
if (g_ActiveConfig.bDumpTextures)
DumpTexture(entry, level);
DumpTexture(entry, basename, level);
}
}
else if (using_custom_lods)