diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-08-22 16:49:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 16:49:40 +0200 |
| commit | 10d20d47aa8d081c74293d4e4005674ac5d00bb5 (patch) | |
| tree | daa3e407866b0748656485cb61f47275fdac595c /Source/Core/VideoCommon/Fifo.cpp | |
| parent | 3156e8590be0918c120e0655d88163de8a9172c5 (diff) | |
| parent | 5635d4b709a103fd8fcef2ed9be615296cb020e7 (diff) | |
Merge pull request #4132 from lioncash/enum-fifo
Fifo: Make SyncGPUReason an enum class
Diffstat (limited to 'Source/Core/VideoCommon/Fifo.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Fifo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index 48dcd9cf9b..bb4ad817a2 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -92,7 +92,7 @@ void PauseAndLock(bool doLock, bool unpauseOnUnlock) { if (doLock) { - SyncGPU(SYNC_GPU_OTHER); + SyncGPU(SyncGPUReason::Other); EmulatorState(false); FlushGpu(); } @@ -199,7 +199,7 @@ void PushFifoAuxBuffer(void* ptr, size_t size) { if (size > (size_t)(s_fifo_aux_data + FIFO_SIZE - s_fifo_aux_write_ptr)) { - SyncGPU(SYNC_GPU_AUX_SPACE, /* may_move_read_ptr */ false); + SyncGPU(SyncGPUReason::AuxSpace, /* may_move_read_ptr */ false); if (!s_gpu_mainloop.IsRunning()) { // GPU is shutting down @@ -255,7 +255,7 @@ static void ReadDataFromFifoOnCPU(u32 readPtr) { // We can't wrap around while the GPU is working on the data. // This should be very rare due to the reset in SyncGPU. - SyncGPU(SYNC_GPU_WRAPAROUND); + SyncGPU(SyncGPUReason::Wraparound); if (!s_gpu_mainloop.IsRunning()) { // GPU is shutting down, so the next asserts may fail |
