diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp index 4ada117c4b..a8ee3c8df6 100644 --- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp +++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp @@ -107,7 +107,6 @@ u16 m_tokenReg; static u32 fake_GPWatchdogLastToken = 0; static Common::EventEx s_fifoIdleEvent; -static Common::CriticalSection sFifoCritical; static bool bProcessFifoToLoWatermark = false; static bool bProcessFifoAllDistance = false; @@ -128,16 +127,6 @@ void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate) UpdateInterrupts(userdata); } -void FifoCriticalEnter() -{ - sFifoCritical.Enter(); -} - -void FifoCriticalLeave() -{ - sFifoCritical.Leave(); -} - void DoState(PointerWrap &p) { p.Do(m_CPStatusReg); diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp index de50dc1fad..18daeec5b7 100644 --- a/Source/Core/VideoCommon/Src/Fifo.cpp +++ b/Source/Core/VideoCommon/Src/Fifo.cpp @@ -40,7 +40,6 @@ static int size = 0; void Fifo_DoState(PointerWrap &p) { - CommandProcessor::FifoCriticalEnter(); p.DoArray(videoBuffer, FIFO_SIZE); p.Do(size); @@ -48,7 +47,6 @@ void Fifo_DoState(PointerWrap &p) p.Do(pos); // read or write offset (depends on the mode afaik) g_pVideoData = &videoBuffer[pos]; // overwrite g_pVideoData -> expected no change when load ss and change when save ss - CommandProcessor::FifoCriticalLeave(); } void Fifo_Init() @@ -150,8 +148,6 @@ void Fifo_EnterLoop() if (!fifoStateRun) break; - CommandProcessor::FifoCriticalEnter(); - // Create pointer to video data and send it to the VideoPlugin u32 readPtr = _fifo.CPReadPointer; u8 *uData = Memory::GetPointer(readPtr); @@ -175,8 +171,6 @@ void Fifo_EnterLoop() Common::AtomicAdd(_fifo.CPReadWriteDistance, -distToSend); CommandProcessor::SetStatus(); - - CommandProcessor::FifoCriticalLeave(); // This call is pretty important in DualCore mode and must be called in the FIFO Loop. // If we don't, s_swapRequested or s_efbAccessRequested won't be set to false diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp index e84f4356d5..2316262b19 100644 --- a/Source/Core/VideoCommon/Src/MainBase.cpp +++ b/Source/Core/VideoCommon/Src/MainBase.cpp @@ -184,10 +184,8 @@ void VideoFifo_CheckStateRequest() if (Common::AtomicLoadAcquire(s_doStateRequested)) { // Clear all caches that touch RAM - CommandProcessor::FifoCriticalEnter(); TextureCache::Invalidate(false); VertexLoaderManager::MarkAllDirty(); - CommandProcessor::FifoCriticalLeave(); PointerWrap p(s_doStateArgs.ptr, s_doStateArgs.mode); VideoCommon_DoState(p);