Fix saving states on mesa3d and clean up the handling of asynchronous requests

(those originating from a thread other than the gpu thread)

glxMakeCurrent is supposed to error out when the context is
still current in another thread. NVIDIA handles that, but mesa3d errors.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6054 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 3 insertions, 7 deletions

diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index e833a5cf52..5169129c2e 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -142,8 +142,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 	{
 		video_initialize.pPeekMessages();
 
-		VideoFifo_CheckEFBAccess();
-		VideoFifo_CheckSwapRequest();
+		VideoFifo_CheckAsyncRequest();
 
 		// check if we are able to run this buffer		
 		
@@ -209,8 +208,7 @@ void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
 			// If we don't, s_swapRequested (OGL only) or s_efbAccessRequested won't be set to false
 			// leading the CPU thread to wait in Video_BeginField or Video_AccessEFB thus slowing things down.
 			
-			VideoFifo_CheckEFBAccess();
-			VideoFifo_CheckSwapRequest();
+			VideoFifo_CheckAsyncRequest();
 			CommandProcessor::isFifoBusy = false;						
 		}
 		
diff --git a/Source/Core/VideoCommon/Src/Fifo.h b/Source/Core/VideoCommon/Src/Fifo.h
index 124a019f7d..95c7630a5d 100644
--- a/Source/Core/VideoCommon/Src/Fifo.h
+++ b/Source/Core/VideoCommon/Src/Fifo.h
@@ -43,8 +43,6 @@ void Fifo_DoState(PointerWrap &f);
 void Fifo_SetRendering(bool bEnabled);
 
 // Implemented by the Video Plugin
-void VideoFifo_CheckSwapRequest();
-void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight);
-void VideoFifo_CheckEFBAccess();
+void VideoFifo_CheckAsyncRequest();
 
 #endif // _FIFO_H