Revert changes preloading of RGBA8 tiles.

This path should probally be optimised, but it's out of the
scope of this PR.
This commit is contained in:
Scott Mansell 2014-10-23 18:15:29 +13:00
parent 3aa979d7d7
commit 23832987b5
1 changed files with 6 additions and 3 deletions

View File

@ -466,6 +466,8 @@ static void BPWritten(const BPCmd& bp)
} }
else // RGBA8 tiles (and CI14, but that might just be stupid libogc!) else // RGBA8 tiles (and CI14, but that might just be stupid libogc!)
{ {
u8* src_ptr = Memory::GetPointer(src_addr);
// AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything // AR and GB tiles are stored in separate TMEM banks => can't use a single memcpy for everything
u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE; u32 tmem_addr_odd = tmem_cfg.preload_tmem_odd * TMEM_LINE_SIZE;
@ -475,11 +477,12 @@ static void BPWritten(const BPCmd& bp)
tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE) tmem_addr_odd + TMEM_LINE_SIZE > TMEM_SIZE)
return; return;
Memory::CopyFromEmu(texMem + tmem_addr_even, src_addr, TMEM_LINE_SIZE); // TODO: This isn't very optimised, does a whole lot of small memcpys
Memory::CopyFromEmu(texMem + tmem_addr_odd, src_addr + TMEM_LINE_SIZE, TMEM_LINE_SIZE); memcpy(texMem + tmem_addr_even, src_ptr, TMEM_LINE_SIZE);
memcpy(texMem + tmem_addr_odd, src_ptr + TMEM_LINE_SIZE, TMEM_LINE_SIZE);
tmem_addr_even += TMEM_LINE_SIZE; tmem_addr_even += TMEM_LINE_SIZE;
tmem_addr_odd += TMEM_LINE_SIZE; tmem_addr_odd += TMEM_LINE_SIZE;
src_addr += TMEM_LINE_SIZE * 2; src_ptr += TMEM_LINE_SIZE * 2;
} }
} }
} }