From 673826be795d312bf35e266038557cf08f3dd422 Mon Sep 17 00:00:00 2001
From: Luke Usher <luke.usher@outlook.com>
Date: Tue, 6 Feb 2018 06:47:04 +0000
Subject: [PATCH] Fixed the regression causing some frames to not render in
 Zelda - Oni Link Begins

 - Added a ForceRehash flag to the resource information structure
 - Lock2DSurface now is a trampoline which calls the xbox function, but also marks our resource as needs rehash. If a title calls Lock2DSurface, we can assume it's to modify a resource.
---
 src/CxbxKrnl/EmuD3D8.cpp | 49 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp
index 72dbae6f5..937f61e0f 100755
--- a/src/CxbxKrnl/EmuD3D8.cpp
+++ b/src/CxbxKrnl/EmuD3D8.cpp
@@ -745,6 +745,7 @@ typedef struct {
 	void* pXboxData = nullptr;
 	size_t szXboxDataSize = 0;
 	uint32_t hash = 0;
+	bool forceRehash = false;
 	std::chrono::time_point<std::chrono::high_resolution_clock> nextHashTime;
 	std::chrono::milliseconds hashLifeTime = 1ms;
 } host_resource_info_t;
@@ -775,6 +776,15 @@ void FreeHostResource(resource_key_t key)
 	}
 }
 
+void ForceResourceRehash(XTL::X_D3DResource* pXboxResource)
+{
+	auto key = GetHostResourceKey(pXboxResource);
+	auto it = g_HostResources.find(key);
+	if (it != g_HostResources.end()) {
+		it->second.forceRehash = true;
+	}
+}
+
 XTL::IDirect3DResource8 *GetHostResource(XTL::X_D3DResource *pXboxResource, bool shouldRegister = true)
 {
 	if (pXboxResource == NULL || pXboxResource->Data == NULL)
@@ -856,7 +866,7 @@ bool HostResourceRequiresUpdate(resource_key_t key)
 	bool modified = false;
 
 	auto now = std::chrono::high_resolution_clock::now();
-	if (now > it->second.nextHashTime) {
+	if (now > it->second.nextHashTime || it->second.forceRehash) {
 		uint32_t oldHash = it->second.hash;
 		it->second.hash = XXHash32::hash(it->second.pXboxData, it->second.szXboxDataSize, 0);
 
@@ -871,6 +881,8 @@ bool HostResourceRequiresUpdate(resource_key_t key)
 				it->second.hashLifeTime += 10ms;
 			}
 		}
+		
+		it->second.forceRehash = false;
 	}
 
 	// Update the next hash time based on the hash lifetime
@@ -895,6 +907,7 @@ void SetHostResource(XTL::X_D3DResource* pXboxResource, XTL::IDirect3DResource8*
 	hostResourceInfo.hash = XXHash32::hash(hostResourceInfo.pXboxData, hostResourceInfo.szXboxDataSize, 0);
 	hostResourceInfo.hashLifeTime = 1ms;
 	hostResourceInfo.nextHashTime = std::chrono::high_resolution_clock::now() + hostResourceInfo.hashLifeTime;
+	hostResourceInfo.forceRehash = false;
 
 	g_HostResources[key] = hostResourceInfo;
 
@@ -6444,6 +6457,40 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetTransform)
 	DEBUG_D3DRESULT(hRet, "g_pD3DDevice8->GetTransform");    
 }
 
+// ******************************************************************
+// * patch: Lock2DSurface
+// ******************************************************************
+VOID WINAPI XTL::EMUPATCH(Lock2DSurface)
+(
+	X_D3DPixelContainer *pPixelContainer,
+	D3DCUBEMAP_FACES     FaceType,
+	UINT                 Level,
+	D3DLOCKED_RECT      *pLockedRect,
+	RECT                *pRect,
+	DWORD                Flags
+	)
+{
+	FUNC_EXPORTS
+
+	LOG_FUNC_BEGIN
+		LOG_FUNC_ARG(pPixelContainer)
+		LOG_FUNC_ARG(FaceType)
+		LOG_FUNC_ARG(Level)
+		LOG_FUNC_ARG(pLockedRect)
+		LOG_FUNC_ARG(pRect)
+		LOG_FUNC_ARG(Flags)
+		LOG_FUNC_END;
+
+
+	// Pass through to the Xbox implementation of this function
+	typedef VOID(__stdcall *XB_Lock2DSurface_t)(X_D3DPixelContainer*, D3DCUBEMAP_FACES, UINT, D3DLOCKED_RECT*, RECT*, DWORD);
+	static XB_Lock2DSurface_t XB_Lock2DSurface = (XB_Lock2DSurface_t)GetXboxFunctionPointer("Lock2DSurface");
+	XB_Lock2DSurface(pPixelContainer, FaceType, Level, pLockedRect, pRect, Flags);
+
+	// Mark the resource as modified
+	ForceResourceRehash(pPixelContainer);
+}
+
 // ******************************************************************
 // * patch: IDirect3DVertexBuffer8_Lock
 // ******************************************************************