diff options
| author | donkopunchstania <donkopunchstania@gmail.com> | 2009-01-11 22:25:57 +0000 |
|---|---|---|
| committer | donkopunchstania <donkopunchstania@gmail.com> | 2009-01-11 22:25:57 +0000 |
| commit | d6e8c1f5d02db17bd5d84e52dea6a9c5c12d4237 (patch) | |
| tree | dd0a8213009d8bc47bbd92ff6aaa5a31da9f2ca3 /Source/Core/DiscIO/Src/VolumeDirectory.cpp | |
| parent | 394b040f61981a649c0d1e0e08bec6ea31dce262 (diff) | |
added an option to copy textures from the EFB to system memory. this is slower but shouldn't cause the compatibility issues the previous method of copying them directly to a GL texture has. the new method can be tested by disabling "copy EFB to texture" in the hacks section. the new method still needs some tweaks.
fixed some off-by-one errors in the EFB to texture copy and the scissor box. also fixed a couple asserts I was getting in the volume directory stuff.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1853 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/VolumeDirectory.cpp')
| -rw-r--r-- | Source/Core/DiscIO/Src/VolumeDirectory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp index ff7f883636..e30513adeb 100644 --- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp @@ -332,7 +332,7 @@ void CVolumeDirectory::BuildFST() } // overflow check - _dbg_assert_(DVDINTERFACE, nameOffset == m_fstSize); + _dbg_assert_(DVDINTERFACE, nameOffset == m_totalNameSize); // write FST size and location _dbg_assert_(DVDINTERFACE, m_diskHeader); @@ -344,6 +344,9 @@ void CVolumeDirectory::BuildFST() void CVolumeDirectory::WriteToBuffer(u64 _SrcStartAddress, u64 _SrcLength, u8* _Src, u64& _Address, u64& _Length, u8*& _pBuffer) const { + if(_Length == 0) + return; + _dbg_assert_(DVDINTERFACE, _Address >= _SrcStartAddress); u64 srcOffset = _Address - _SrcStartAddress; |