ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partial texture updates with parts of efb copies new version

This commit is contained in:
mimimi085181 2016-02-29 01:42:30 +01:00
parent a53c0f6995
commit 80250f47e9
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -307,28 +307,35 @@ TextureCacheBase::TCacheEntryBase* TextureCacheBase::DoPartialTextureUpdates(Tex
TCacheEntryBase* entry = iter->second; TCacheEntryBase* entry = iter->second;
if (entry != entry_to_update if (entry != entry_to_update
&& entry->IsEfbCopy() && entry->IsEfbCopy()
&& entry_to_update->addr <= entry->addr && entry->OverlapsMemoryRange(entry_to_update->addr, entry_to_update->size_in_bytes)
&& entry->addr + entry->size_in_bytes <= entry_to_update->addr + entry_to_update->size_in_bytes
&& entry->frameCount == FRAMECOUNT_INVALID && entry->frameCount == FRAMECOUNT_INVALID
&& entry->memory_stride == numBlocksX * block_size) && entry->memory_stride == numBlocksX * block_size)
{ {
if (entry->hash == entry->CalculateHash()) if (entry->hash == entry->CalculateHash())
{ {
u32 block_offset = (entry->addr - entry_to_update->addr) / block_size; u32 src_x, src_y, dst_x, dst_y;
u32 block_x = block_offset % numBlocksX;
u32 block_y = block_offset / numBlocksX;
u32 dst_x = block_x * block_width; // Note for understanding the math:
u32 dst_y = block_y * block_height; // Normal textures can't be strided, so the 2 missing cases with src_x > 0 don't exist
u32 src_x = 0; if (entry->addr >= entry_to_update->addr)
u32 src_y = 0;
// If the EFB copy doesn't fully fit, cancel the copy process
if (entry->native_width - src_x > entry_to_update->native_width - dst_x
|| entry->native_height - src_y > entry_to_update->native_height - dst_y)
{ {
iter++; u32 block_offset = (entry->addr - entry_to_update->addr) / block_size;
continue; u32 block_x = block_offset % numBlocksX;
u32 block_y = block_offset / numBlocksX;
src_x = 0;
src_y = 0;
dst_x = block_x * block_width;
dst_y = block_y * block_height;
}
else
{
u32 block_offset = (entry_to_update->addr - entry->addr) / block_size;
u32 block_x = (~block_offset + 1) % numBlocksX;
u32 block_y = (block_offset + block_x) / numBlocksX;
src_x = 0;
src_y = block_y * block_height;
dst_x = block_x * block_width;
dst_y = 0;
} }
u32 copy_width = std::min(entry->native_width - src_x, entry_to_update->native_width - dst_x); u32 copy_width = std::min(entry->native_width - src_x, entry_to_update->native_width - dst_x);