diff options
| author | magumagu <magumagu9@gmail.com> | 2015-03-01 13:06:43 -0800 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-03-01 13:06:43 -0800 |
| commit | 7f7973efa552c87ba23426e42ce9757ebc9fbdb6 (patch) | |
| tree | 9a31cb5f3c6b9406ca842d7e950e6c70a7ca9940 /Source/Core/VideoCommon | |
| parent | b4a586f84af1d1c95e764f8458b87aa998232b2e (diff) | |
| parent | 9493c713ddd2b2eb5805bdd4edf29837c76ae77f (diff) | |
Merge pull request #2148 from Tilka/fifo_cleanup
Small FIFO-related cleanup
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.cpp | 16 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.h | 5 |
2 files changed, 4 insertions, 17 deletions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index 4a85679210..8c7dbce49b 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -104,7 +104,8 @@ void Fifo_Init() void Fifo_Shutdown() { - if (GpuRunningState) PanicAlert("Fifo shutting down while active"); + if (GpuRunningState) + PanicAlert("Fifo shutting down while active"); FreeMemoryPages(s_video_buffer, FIFO_SIZE + 4); s_video_buffer = nullptr; s_video_buffer_write_ptr = nullptr; @@ -115,16 +116,6 @@ void Fifo_Shutdown() s_fifo_aux_read_ptr = nullptr; } -u8* GetVideoBufferStartPtr() -{ - return s_video_buffer; -} - -u8* GetVideoBufferEndPtr() -{ - return s_video_buffer_write_ptr; -} - void Fifo_SetRendering(bool enabled) { g_bSkipCurrentFrame = !enabled; @@ -137,7 +128,8 @@ void ExitGpuLoop() // This should break the wait loop in CPU thread CommandProcessor::fifo.bFF_GPReadEnable = false; SCPFifoStruct &fifo = CommandProcessor::fifo; - while (fifo.isGpuReadingData) Common::YieldCPU(); + while (fifo.isGpuReadingData) + Common::YieldCPU(); // Terminate GPU thread loop GpuRunningState = false; EmuRunningState = true; diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h index 56212e7d17..8cec0d824d 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -20,10 +20,6 @@ extern std::atomic<u8*> g_video_buffer_write_ptr_xthread; void Fifo_Init(); void Fifo_Shutdown(); - -u8* GetVideoBufferStartPtr(); -u8* GetVideoBufferEndPtr(); - void Fifo_DoState(PointerWrap &f); void Fifo_PauseAndLock(bool doLock, bool unpauseOnUnlock); void Fifo_UpdateWantDeterminism(bool want); @@ -31,7 +27,6 @@ void Fifo_UpdateWantDeterminism(bool want); // Used for diagnostics. enum SyncGPUReason { - SYNC_GPU_NONE, SYNC_GPU_OTHER, SYNC_GPU_WRAPAROUND, SYNC_GPU_EFB_POKE, |