diff options
| author | JosJuice <josjuice@gmail.com> | 2016-08-19 11:04:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 11:04:45 +0200 |
| commit | 31c530c7b3043a0673d8ec8694169d1accbb732f (patch) | |
| tree | 54d3b015e71bb65e1134844c4313ae45b4155612 /Source/Core/VideoCommon/Fifo.cpp | |
| parent | 40f4308dc2120ce4e105008f3cb46b6a1c553e64 (diff) | |
| parent | fbc0aaf79672cd20c580a28ba765e4a07c2c8c67 (diff) | |
Merge pull request #3386 from lioncash/memory
Common: Namespace MemoryUtil
Diffstat (limited to 'Source/Core/VideoCommon/Fifo.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index 8d3df111e4..48dcd9cf9b 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -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; |