mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 06:48:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CustomTexture: prefetch all available textures

Browse source
This commit is contained in:
degasus 2015-03-01 23:53:15 +01:00
parent 7e6ec5fa86
commit 242f7d964d
8 changed files with 170 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,8 +60,7 @@ TextureCache::TextureCache()
TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
if (g_ActiveConfig.bHiresTextures && !g_ActiveConfig.bDumpTextures)
HiresTexture::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID);
HiresTexture::Init();
SetHash64Function();
@ -92,6 +91,7 @@ void TextureCache::Invalidate()
TextureCache::~TextureCache()
{
HiresTexture::Shutdown();
Invalidate();
FreeAlignedMemory(temp);
temp = nullptr;
@ -101,6 +101,12 @@ void TextureCache::OnConfigChanged(VideoConfig& config)
{
if (g_texture_cache)
{
if (config.bHiresTextures != backup_config.s_hires_textures ||
config.bCacheHiresTextures != backup_config.s_cache_hires_textures)
{
HiresTexture::Update();
}
// TODO: Invalidating texcache is really stupid in some of these cases
if (config.iSafeTextureCache_ColorSamples != backup_config.s_colorsamples ||
config.bTexFmtOverlayEnable != backup_config.s_texfmt_overlay ||
@ -110,9 +116,6 @@ void TextureCache::OnConfigChanged(VideoConfig& config)
{
g_texture_cache->Invalidate();
if (g_ActiveConfig.bHiresTextures)
HiresTexture::Init(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID);
TexDecoder_SetTexFmtOverlayOptions(g_ActiveConfig.bTexFmtOverlayEnable, g_ActiveConfig.bTexFmtOverlayCenter);
invalidate_texture_cache_requested = false;
@ -130,6 +133,7 @@ void TextureCache::OnConfigChanged(VideoConfig& config)
backup_config.s_texfmt_overlay = config.bTexFmtOverlayEnable;
backup_config.s_texfmt_overlay_center = config.bTexFmtOverlayCenter;
backup_config.s_hires_textures = config.bHiresTextures;
backup_config.s_cache_hires_textures = config.bCacheHiresTextures;
backup_config.s_stereo_3d = config.iStereoMode > 0;
backup_config.s_efb_mono_depth = config.bStereoEFBMonoDepth;
}
@ -433,15 +437,15 @@ TextureCache::TCacheEntryBase* TextureCache::Load(const u32 stage)
textures.erase(oldest_entry);
}
std::unique_ptr<HiresTexture> hires_tex;
std::shared_ptr<HiresTexture> hires_tex;
if (g_ActiveConfig.bHiresTextures)
{
hires_tex.reset(HiresTexture::Search(
hires_tex = HiresTexture::Search(
src_data, texture_size,
&texMem[tlutaddr], palette_size,
width, height,
texformat, use_mipmaps
));
);
if (hires_tex)
{