From 25285dd2c63933f990200e91db9f6c0d1920e661 Mon Sep 17 00:00:00 2001
From: Luke Usher <luke.usher@outlook.com>
Date: Thu, 21 Jun 2018 08:47:43 +0100
Subject: [PATCH] Remove Blocking/Wait related patches that were not needed

---
 src/CxbxKrnl/EmuD3D.cpp.unused-patches | 35 ++++++++++++++-
 src/CxbxKrnl/EmuD3D8.cpp               | 59 +++++++-------------------
 2 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/src/CxbxKrnl/EmuD3D.cpp.unused-patches b/src/CxbxKrnl/EmuD3D.cpp.unused-patches
index 533d89f23..a52f5aade 100644
--- a/src/CxbxKrnl/EmuD3D.cpp.unused-patches
+++ b/src/CxbxKrnl/EmuD3D.cpp.unused-patches
@@ -2862,4 +2862,37 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetViewport)
 			EmuWarning("GetHostRenderTargetDimensions failed - GetViewport returns host viewport instead!");
 		}
 	}
-}
\ No newline at end of file
+}
+
+// ******************************************************************
+// * patch: D3D_BlockOnResource
+// ******************************************************************
+void WINAPI XTL::EMUPATCH(D3D_BlockOnResource)( X_D3DResource* pResource )
+{
+	FUNC_EXPORTS
+
+	LOG_FUNC_ONE_ARG(pResource);
+
+	// TODO: Implement
+	// NOTE: Azurik appears to call this directly from numerous points
+	LOG_UNIMPLEMENTED();
+		
+}
+
+
+// ******************************************************************
+// * patch: IDirect3DResource8_IsBusy
+// ******************************************************************
+BOOL WINAPI XTL::EMUPATCH(D3DResource_IsBusy)
+(
+    X_D3DResource      *pThis
+)
+{
+	FUNC_EXPORTS
+
+    /* too much output
+	LOG_FUNC_ONE_ARG(pThis);
+    //*/
+
+    return FALSE;
+}
diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp
index deabc3e66..318a0a607 100644
--- a/src/CxbxKrnl/EmuD3D8.cpp
+++ b/src/CxbxKrnl/EmuD3D8.cpp
@@ -2614,18 +2614,6 @@ HRESULT WINAPI XTL::EMUPATCH(Direct3D_CreateDevice)
 	return hRet;
 }
 
-// ******************************************************************
-// * patch: IDirect3DResource8_IsBusy
-// ******************************************************************
-BOOL WINAPI XTL::EMUPATCH(D3DDevice_IsBusy)()
-{
-	FUNC_EXPORTS
-
-	LOG_FUNC();
-    
-    return FALSE;
-}
-
 // ******************************************************************
 // * patch: D3DDevice_GetDisplayFieldStatus
 // ******************************************************************
@@ -5550,23 +5538,6 @@ ULONG WINAPI XTL::EMUPATCH(D3DResource_Release)
     return uRet;
 }
 
-// ******************************************************************
-// * patch: IDirect3DResource8_IsBusy
-// ******************************************************************
-BOOL WINAPI XTL::EMUPATCH(D3DResource_IsBusy)
-(
-    X_D3DResource      *pThis
-)
-{
-	FUNC_EXPORTS
-
-    /* too much output
-	LOG_FUNC_ONE_ARG(pThis);
-    //*/
-
-    return FALSE;
-}
-
 // ******************************************************************
 // * patch: D3DDevice_EnableOverlay
 // ******************************************************************
@@ -9300,6 +9271,21 @@ void WINAPI XTL::EMUPATCH(D3D_SetCommonDebugRegisters)()
 
 }
 
+// ******************************************************************
+// * patch: D3DDevice_IsBusy
+// ******************************************************************
+BOOL WINAPI XTL::EMUPATCH(D3DDevice_IsBusy)()
+{
+	FUNC_EXPORTS
+
+		LOG_FUNC();
+
+	// NOTE: This function returns FALSE when the NV2A FIFO is empty/complete, or NV_PGRAPH_STATUS = 0
+	// Otherwise, it returns true.
+
+	return FALSE;
+}
+
 // ******************************************************************
 // * patch: D3D_BlockOnTime
 // ******************************************************************
@@ -9321,21 +9307,6 @@ void WINAPI XTL::EMUPATCH(D3D_BlockOnTime)( DWORD Unknown1, int Unknown2 )
 	LOG_UNIMPLEMENTED();
 }
 
-// ******************************************************************
-// * patch: D3D_BlockOnResource
-// ******************************************************************
-void WINAPI XTL::EMUPATCH(D3D_BlockOnResource)( X_D3DResource* pResource )
-{
-	FUNC_EXPORTS
-
-	LOG_FUNC_ONE_ARG(pResource);
-
-	// TODO: Implement
-	// NOTE: Azurik appears to call this directly from numerous points
-	LOG_UNIMPLEMENTED();
-		
-}
-
 // ******************************************************************
 // * patch: D3DDevice_SetRenderTargetFast
 // ******************************************************************