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

Guard against nested SetTransform/MultiplyTransform calls 

In the case of 25 to Life, MultiplyTransform calls SetTransform
which corrupted the host's internal state. Introduce a guard variable
to ensure we call to host only once per the patch chain and keep
the internal state pristine
This commit is contained in:
Silent 2020-10-26 18:54:39 +01:00
parent acff986fe1
commit 4dd9aaeed7
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1
1 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6459,40 +6459,66 @@ void CxbxImpl_SetTransform
LOG_FUNC_ARG(pMatrix) LOG_FUNC_ARG(pMatrix)
LOG_FUNC_END; LOG_FUNC_END;
State = EmuXB2PC_D3DTS(State); State = EmuXB2PC_D3DTS(State);
HRESULT hRet = g_pD3DDevice->SetTransform(State, pMatrix); HRESULT hRet = g_pD3DDevice->SetTransform(State, pMatrix);
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetTransform"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetTransform");
} }
// MultiplyTransform can call SetTransform, nested call detection is required
// Test case: 25 to Life
static thread_local uint32_t setTransformCount = 0;
// LTCG specific D3DDevice_SetTransform function... // LTCG specific D3DDevice_SetTransform function...
// This uses a custom calling convention where parameter is passed in EAX, EDX // This uses a custom calling convention where parameter is passed in EAX, EDX
// Naked functions must not contain objects that would require unwinding
// so we cheat a bit by stashing the function body in a separate function
static void D3DDevice_SetTransform_0_Inner
(
D3DTRANSFORMSTATETYPE State,
CONST D3DMATRIX *pMatrix
)
{
NestedPatchCounter call(setTransformCount);
__asm {
// Trampoline to guest code to remove the need for a GetTransform patch
mov eax, State
mov edx, pMatrix
call XB_TRMP(D3DDevice_SetTransform_0)
}
if (call.GetLevel() == 0) {
// 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)
( (
) )
{ {
D3DTRANSFORMSTATETYPE State; D3DTRANSFORMSTATETYPE State;
CONST D3DMATRIX *pMatrix; CONST D3DMATRIX *pMatrix;
// prologue // prologue
__asm { __asm {
push ebp push ebp
mov ebp, esp mov ebp, esp
sub esp, __LOCAL_SIZE sub esp, __LOCAL_SIZE
mov State, eax mov State, eax
mov pMatrix, edx mov pMatrix, edx
// Trampoline to guest code to remove the need for a GetTransform patch }
call XB_TRMP(D3DDevice_SetTransform_0)
}
CxbxImpl_SetTransform(State, pMatrix); D3DDevice_SetTransform_0_Inner(State, pMatrix);
// epilogue // epilogue
__asm { __asm {
mov esp, ebp mov esp, ebp
pop ebp pop ebp
ret ret
} }
} }
// ****************************************************************** // ******************************************************************
@ -6504,9 +6530,14 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform)
CONST D3DMATRIX *pMatrix CONST D3DMATRIX *pMatrix
) )
{ {
// Trampoline to guest code to remove the need for a GetTransform patch NestedPatchCounter call(setTransformCount);
// Trampoline to guest code to remove the need for a GetTransform patch
XB_TRMP(D3DDevice_SetTransform)(State, pMatrix); XB_TRMP(D3DDevice_SetTransform)(State, pMatrix);
CxbxImpl_SetTransform(State, pMatrix); if (call.GetLevel() == 0) {
// Skip if this patch is called from MultiplyTransform
CxbxImpl_SetTransform(State, pMatrix);
}
} }
// ****************************************************************** // ******************************************************************
@ -6514,23 +6545,24 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetTransform)
// ****************************************************************** // ******************************************************************
xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_MultiplyTransform)
( (
D3DTRANSFORMSTATETYPE State, D3DTRANSFORMSTATETYPE State,
CONST D3DMATRIX *pMatrix CONST D3DMATRIX *pMatrix
) )
{ {
LOG_FUNC_BEGIN LOG_FUNC_BEGIN
LOG_FUNC_ARG(State) LOG_FUNC_ARG(State)
LOG_FUNC_ARG(pMatrix) LOG_FUNC_ARG(pMatrix)
LOG_FUNC_END; LOG_FUNC_END;
NestedPatchCounter call(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_MultiplyTransform)(State, pMatrix); XB_TRMP(D3DDevice_MultiplyTransform)(State, pMatrix);
State = EmuXB2PC_D3DTS(State); State = EmuXB2PC_D3DTS(State);
HRESULT hRet = g_pD3DDevice->MultiplyTransform(State, pMatrix); HRESULT hRet = g_pD3DDevice->MultiplyTransform(State, pMatrix);
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->MultiplyTransform"); DEBUG_D3DRESULT(hRet, "g_pD3DDevice->MultiplyTransform");
} }
// ****************************************************************** // ******************************************************************