Skip to content
Permalink
Browse files

VideoCommon/TextureCacheBase: Remove use of the texture cache global

We can just call the functions that are part of the interface instead of
using the global in order to execute those functions.
  • Loading branch information...
lioncash committed Aug 5, 2019
1 parent 7f6abfb commit fd12ae1408f5e19a23cee6df4727a7b70ef0d312
Showing with 3 additions and 3 deletions.
  1. +3 −3 Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -572,7 +572,7 @@ void TextureCacheBase::DoSaveState(PointerWrap& p)
p.Do(size);
for (TCacheEntry* entry : entries_to_save)
{
g_texture_cache->SerializeTexture(entry->texture.get(), entry->texture->GetConfig(), p);
SerializeTexture(entry->texture.get(), entry->texture->GetConfig(), p);
entry->DoState(p);
}
p.DoMarker("TextureCacheEntries");
@@ -652,9 +652,9 @@ void TextureCacheBase::DoLoadState(PointerWrap& p)
{
// Even if the texture isn't valid, we still need to create the cache entry object
// to update the point in the state state. We'll just throw it away if it's invalid.
auto tex = g_texture_cache->DeserializeTexture(p);
auto tex = DeserializeTexture(p);
TCacheEntry* entry = new TCacheEntry(std::move(tex->texture), std::move(tex->framebuffer));
entry->textures_by_hash_iter = g_texture_cache->textures_by_hash.end();
entry->textures_by_hash_iter = textures_by_hash.end();
entry->DoState(p);
if (entry->texture && commit_state)
id_map.emplace(i, entry);

0 comments on commit fd12ae1

Please sign in to comment.
You can’t perform that action at this time.