Merge pull request #3386 from lioncash/memory

Common: Namespace MemoryUtil
This commit is contained in:
JosJuice
2016-08-19 11:04:45 +02:00
committed by GitHub
15 changed files with 49 additions and 47 deletions

View File

@ -106,7 +106,7 @@ void PauseAndLock(bool doLock, bool unpauseOnUnlock)
void Init()
{
// Padded so that SIMD overreads in the vertex loader are safe
s_video_buffer = (u8*)AllocateMemoryPages(FIFO_SIZE + 4);
s_video_buffer = static_cast<u8*>(Common::AllocateMemoryPages(FIFO_SIZE + 4));
ResetVideoBuffer();
if (SConfig::GetInstance().bCPUThread)
s_gpu_mainloop.Prepare();
@ -118,7 +118,7 @@ void Shutdown()
if (s_gpu_mainloop.IsRunning())
PanicAlert("Fifo shutting down while active");
FreeMemoryPages(s_video_buffer, FIFO_SIZE + 4);
Common::FreeMemoryPages(s_video_buffer, FIFO_SIZE + 4);
s_video_buffer = nullptr;
s_video_buffer_write_ptr = nullptr;
s_video_buffer_pp_read_ptr = nullptr;