Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "VideoCommon: create native texture pool" 
This reverts commit 6cece6b.

In fact, there was a _huge_ speedup on lots of games (mostly on nvidia+ogl), but there are some crashes on D3D.
I have to fix this crash and then I'll commit something like this again :-)

Conflicts:
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
  • Loading branch information
@degasus
degasus committed Nov 7, 2013
1 parent 33d56f5 commit 8923968
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 85 deletions.
90 changes: 10 additions & 80 deletions Source/Core/VideoCommon/Src/TextureCacheBase.cpp
View file
Expand Up @@ -30,8 +30,6 @@ unsigned int TextureCache::temp_size;

TextureCache::TexCache TextureCache::textures;

TextureCache::TexPool TextureCache::texPool;

TextureCache::BackupConfig TextureCache::backup_config;

bool invalidate_texture_cache_requested;
Expand Down Expand Up @@ -70,13 +68,6 @@ void TextureCache::Invalidate()
delete iter->second;

textures.clear();

TexPool::iterator
iter2 = texPool.begin(),
tcend2 = texPool.end();
for (; iter2 != tcend2; ++iter2)
delete iter2->second;
texPool.clear();
}

TextureCache::~TextureCache()
Expand Down Expand Up @@ -144,29 +135,14 @@ void TextureCache::Cleanup()
// EFB copies living on the host GPU are unrecoverable and thus shouldn't be deleted
&& ! iter->second->IsEfbCopy() )
{
PoolTexture(iter->second);
delete iter->second;
textures.erase(iter++);
}
else
{
++iter;
}
}

TexPool::iterator iter2 = texPool.begin();
TexPool::iterator tcend2 = texPool.end();
while (iter2 != tcend2)
{
if (frameCount > TEXTURE_KILL_THRESHOLD + iter2->second->frameCount)
{
delete iter2->second;
texPool.erase(iter2++);
}
else
{
++iter2;
}
}
}

void TextureCache::InvalidateRange(u32 start_address, u32 size)
Expand All @@ -179,7 +155,7 @@ void TextureCache::InvalidateRange(u32 start_address, u32 size)
const int rangePosition = iter->second->IntersectsMemoryRange(start_address, size);
if (0 == rangePosition)
{
PoolTexture(iter->second);
delete iter->second;
textures.erase(iter++);
}
else
Expand Down Expand Up @@ -239,7 +215,7 @@ void TextureCache::ClearRenderTargets()
{
if (iter->second->type == TCET_EC_VRAM)
{
PoolTexture(iter->second);
delete iter->second;
textures.erase(iter++);
}
else
Expand Down Expand Up @@ -450,8 +426,8 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
}
else
{
// pool the texture and make a new one
PoolTexture(entry);
// delete the texture and make a new one
delete entry;
entry = NULL;
}
}
Expand All @@ -472,7 +448,7 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
// If we thought we could reuse the texture before, make sure to pool it now!
if(entry)
{
PoolTexture(entry);
delete entry;
entry = NULL;
}
}
Expand Down Expand Up @@ -500,15 +476,6 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
const bool use_native_mips = use_mipmaps && !using_custom_lods && (width == nativeW && height == nativeH);
texLevels = (use_native_mips || using_custom_lods) ? texLevels : 1; // TODO: Should be forced to 1 for non-pow2 textures (e.g. efb copies with automatically adjusted IR)

// try to search for a pooled texture
if (NULL == entry)
{
// Try to find a matching texture in the pool. We pool unused texture as they often just change the type.
// This happens in eg efb2ram which overwrites half of a texture. So most of this textures are only pooled
// for some frames.
textures[texID] = entry = GetPooledTexture ( width, height, full_format, texLevels, false );
}

// create the entry/texture
if (NULL == entry)
{
Expand Down Expand Up @@ -857,23 +824,16 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat
else if (!(entry->type == TCET_EC_VRAM && entry->virtual_width == scaled_tex_w && entry->virtual_height == scaled_tex_h))
{
// remove it and recreate it as a render target
PoolTexture(entry);
delete entry;
entry = NULL;
}
}

if (NULL == entry)
{
// search for a compatible pooled texture
entry = GetPooledTexture(scaled_tex_w, scaled_tex_h, 0, 0, true);

if (NULL == entry)
{
// create the texture
entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h);
}
textures[dstAddr] = entry;

// create the texture
textures[dstAddr] = entry = g_texture_cache->CreateRenderTargetTexture(scaled_tex_w, scaled_tex_h);

// TODO: Using the wrong dstFormat, dumb...
entry->SetGeneralParameters(dstAddr, 0, dstFormat, 1);
entry->SetDimensions(tex_w, tex_h, scaled_tex_w, scaled_tex_h);
Expand All @@ -885,33 +845,3 @@ void TextureCache::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat

entry->FromRenderTarget(dstAddr, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf, cbufid, colmat);
}

TextureCache::TCacheEntryBase* TextureCache::GetPooledTexture ( u32 width, u32 height, u32 full_format, u32 maxlevel, bool isEfbCopy )
{
TCacheEntryBase* entry = NULL;
std::pair<TexPool::iterator, TexPool::iterator> bounds;
bounds = texPool.equal_range(std::make_pair(width, height));
while(!entry && bounds.first != bounds.second) {
entry = bounds.first->second;
if (
(isEfbCopy && entry->IsEfbCopy()) ||
(!isEfbCopy && entry->type == TCET_NORMAL && full_format == entry->format && entry->num_mipmaps == maxlevel) ||
(!isEfbCopy && entry->type == TCET_EC_DYNAMIC)
)
{
texPool.erase(bounds.first);
}
else
{
entry = NULL;
bounds.first++;
}
}
return entry;
}

void TextureCache::PoolTexture(TextureCache::TCacheEntryBase* entry)
{
entry->frameCount = frameCount;
texPool.insert(std::make_pair(std::make_pair(entry->virtual_width, entry->virtual_height), entry));
}
6 changes: 1 addition & 5 deletions Source/Core/VideoCommon/Src/TextureCacheBase.h
View file
Expand Up @@ -121,12 +121,8 @@ class TextureCache
static void DumpTexture(TCacheEntryBase* entry, unsigned int level);

typedef std::map<u32, TCacheEntryBase*> TexCache;

static TexCache textures;

static TCacheEntryBase* GetPooledTexture(u32 width, u32 height, u32 full_format, u32 maxlevel, bool isEfbCopy);
static void PoolTexture(TCacheEntryBase *entry);
typedef std::multimap<std::pair<u32,u32>, TCacheEntryBase*> TexPool;
static TexPool texPool;

// Backup configuration values
static struct BackupConfig
Expand Down

0 comments on commit 8923968

Please sign in to comment.