ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Let MultiplyTransform call SetTransform 

Detect if it didn't
This commit is contained in:
Anthony 2020-12-15 18:32:36 +13:00
parent c77582524d
commit 54e0c08ef1
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/hle/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -6627,7 +6627,7 @@ void CxbxImpl_SetTransform
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetTransform"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetTransform");
} }
// MultiplyTransform can call SetTransform, nested call detection is required // MultiplyTransform should call SetTransform, we'd like to know if it didn't
// Test case: 25 to Life // Test case: 25 to Life
static thread_local uint32_t setTransformCount = 0; static thread_local uint32_t setTransformCount = 0;
@ -6647,7 +6647,7 @@ static void D3DDevice_SetTransform_0
LOG_FUNC_ARG(pMatrix) LOG_FUNC_ARG(pMatrix)
LOG_FUNC_END; LOG_FUNC_END;
NestedPatchCounter call(setTransformCount); setTransformCount++;
__asm { __asm {
// Trampoline to guest code to remove the need for a GetTransform patch // Trampoline to guest code to remove the need for a GetTransform patch
@ -6656,10 +6656,7 @@ static void D3DDevice_SetTransform_0
call XB_TRMP(D3DDevice_SetTransform_0) call XB_TRMP(D3DDevice_SetTransform_0)
} }
if (call.GetLevel() == 0) { CxbxImpl_SetTransform(State, pMatrix);
// Skip if this patch is called from MultiplyTransform
CxbxImpl_SetTransform(State, pMatrix);
}
} }
__declspec(naked) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform_0) __declspec(naked) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform_0)
@ -6697,14 +6694,11 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform)
LOG_FUNC_ARG(pMatrix) LOG_FUNC_ARG(pMatrix)
LOG_FUNC_END; LOG_FUNC_END;
NestedPatchCounter call(setTransformCount); setTransformCount++;
// Trampoline to guest code to remove the need for a GetTransform patch // Trampoline to guest code to remove the need for a GetTransform patch
XB_TRMP(D3DDevice_SetTransform)(State, pMatrix); XB_TRMP(D3DDevice_SetTransform)(State, pMatrix);
if (call.GetLevel() == 0) { CxbxImpl_SetTransform(State, pMatrix);
// Skip if this patch is called from MultiplyTransform
CxbxImpl_SetTransform(State, pMatrix);
}
} }
// ****************************************************************** // ******************************************************************
@ -6721,15 +6715,17 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform)
LOG_FUNC_ARG(pMatrix) LOG_FUNC_ARG(pMatrix)
LOG_FUNC_END; LOG_FUNC_END;
NestedPatchCounter call(setTransformCount); setTransformCount = 0;
// Trampoline to guest code to remove the need for a GetTransform patch // Trampoline to guest code, which we expect to call SetTransform
// If we find a case where the trampoline doesn't call SetTransform
// (or we can't detect the call) we will need to implement this
XB_TRMP(D3DDevice_MultiplyTransform)(State, pMatrix); XB_TRMP(D3DDevice_MultiplyTransform)(State, pMatrix);
auto pcState = EmuXB2PC_D3DTS(State); if (setTransformCount == 0) {
LOG_TEST_CASE("MultiplyTransform did not appear to call SetTransform");
}
HRESULT hRet = g_pD3DDevice->MultiplyTransform(pcState, pMatrix);
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->MultiplyTransform");
} }
// ****************************************************************** // ******************************************************************