mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
Fix bug, reenable the drive optimization.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2370 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
925a66d498
commit
8224c3b449
@ -70,13 +70,14 @@ bool SectorReader::Read(u64 offset, u64 size, u8* out_ptr)
|
||||
while (remain > 0)
|
||||
{
|
||||
// Check if we are ready to do a large block read. > instead of >= so we don't bother if remain is only one block.
|
||||
if (positionInBlock == 0 && remain > m_blocksize && false)
|
||||
if (positionInBlock == 0 && remain > m_blocksize)
|
||||
{
|
||||
u64 num_blocks = remain / m_blocksize;
|
||||
ReadMultipleAlignedBlocks(block, num_blocks, out_ptr);
|
||||
block += num_blocks;
|
||||
out_ptr += num_blocks * m_blocksize;
|
||||
remain -= num_blocks * m_blocksize;
|
||||
continue;
|
||||
}
|
||||
|
||||
u32 toCopy = m_blocksize - positionInBlock;
|
||||
@ -113,7 +114,7 @@ bool SectorReader::ReadMultipleAlignedBlocks(u64 block_num, u64 num_blocks, u8 *
|
||||
const u8 *data = GetBlockData(block_num + i);
|
||||
if (!data)
|
||||
return false;
|
||||
memcpy(out_ptr, data, m_blocksize);
|
||||
memcpy(out_ptr + i * m_blocksize, data, m_blocksize);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user