From e28c97f6bd576c969bb8257a27c11113aed47d0d Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 21 Feb 2015 12:04:26 +0100 Subject: [PATCH 1/2] Fifo: drop unused functions --- Source/Core/VideoCommon/Fifo.cpp | 10 ---------- Source/Core/VideoCommon/Fifo.h | 4 ---- 2 files changed, 14 deletions(-) diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index 4a85679210..abbc31a14c 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -115,16 +115,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; diff --git a/Source/Core/VideoCommon/Fifo.h b/Source/Core/VideoCommon/Fifo.h index 56212e7d17..ec4a4ccf5f 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -20,10 +20,6 @@ extern std::atomic 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); From 9493c713ddd2b2eb5805bdd4edf29837c76ae77f Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sat, 21 Feb 2015 13:20:17 +0100 Subject: [PATCH 2/2] Fifo: small cleanup --- Source/Core/VideoCommon/Fifo.cpp | 6 ++++-- Source/Core/VideoCommon/Fifo.h | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index abbc31a14c..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; @@ -127,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 ec4a4ccf5f..8cec0d824d 100644 --- a/Source/Core/VideoCommon/Fifo.h +++ b/Source/Core/VideoCommon/Fifo.h @@ -27,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,