ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fifo: small cleanup

This commit is contained in:
Tillmann Karras 2015-02-21 13:20:17 +01:00
parent e28c97f6bd
commit 9493c713dd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/Fifo.cpp
View File

@ -104,7 +104,8 @@ void Fifo_Init()
void Fifo_Shutdown() 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); FreeMemoryPages(s_video_buffer, FIFO_SIZE + 4);
s_video_buffer = nullptr; s_video_buffer = nullptr;
s_video_buffer_write_ptr = nullptr; s_video_buffer_write_ptr = nullptr;
@ -127,7 +128,8 @@ void ExitGpuLoop()
// This should break the wait loop in CPU thread // This should break the wait loop in CPU thread
CommandProcessor::fifo.bFF_GPReadEnable = false; CommandProcessor::fifo.bFF_GPReadEnable = false;
SCPFifoStruct &fifo = CommandProcessor::fifo; SCPFifoStruct &fifo = CommandProcessor::fifo;
while (fifo.isGpuReadingData) Common::YieldCPU(); while (fifo.isGpuReadingData)
Common::YieldCPU();
// Terminate GPU thread loop // Terminate GPU thread loop
GpuRunningState = false; GpuRunningState = false;
EmuRunningState = true; EmuRunningState = true;

1
Source/Core/VideoCommon/Fifo.h
View File

@ -27,7 +27,6 @@ void Fifo_UpdateWantDeterminism(bool want);
// Used for diagnostics. // Used for diagnostics.
enum SyncGPUReason enum SyncGPUReason
{ {
SYNC_GPU_NONE,
SYNC_GPU_OTHER, SYNC_GPU_OTHER,
SYNC_GPU_WRAPAROUND, SYNC_GPU_WRAPAROUND,
SYNC_GPU_EFB_POKE, SYNC_GPU_EFB_POKE,