diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-05-22 13:02:11 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-05-22 13:02:11 -0700 |
| commit | b58753bd692d0634e950af9b273bbfb24564d0dd (patch) | |
| tree | 1ead19ca115805bbeaf99ccbd9fc6f14ecfd08ad /Source/Core/VideoBackends | |
| parent | fc41a53b46ce5d7d844a4bd7922f231ebb0f9c5e (diff) | |
| parent | a4bb0dafb4bebeed78452498a36b8ae19fe2e495 (diff) | |
Merge pull request #370 from Sonicadvance1/remove_specialized_memcmp
Removes ZeroFrog's "optimized" memcpy and memcmp functions.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/Software/BPMemLoader.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/XFMemLoader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index d6566f23c5..b21f3171c5 100644 --- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp @@ -99,7 +99,7 @@ void SWBPWritten(int address, int newvalue) ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5); if (ptr) - memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount); + memcpy(texMem + tlutTMemAddr, ptr, tlutXferCount); else PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5); break; diff --git a/Source/Core/VideoBackends/Software/XFMemLoader.cpp b/Source/Core/VideoBackends/Software/XFMemLoader.cpp index 72d05dcee0..d175e6b6dc 100644 --- a/Source/Core/VideoBackends/Software/XFMemLoader.cpp +++ b/Source/Core/VideoBackends/Software/XFMemLoader.cpp @@ -61,7 +61,7 @@ void SWLoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData) // write to XF regs if (transferSize > 0) { - memcpy_gc((u32*)(&xfmem) + baseAddress, pData, transferSize * 4); + memcpy((u32*)(&xfmem) + baseAddress, pData, transferSize * 4); XFWritten(transferSize, baseAddress); } } |