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

Merge pull request #2022 from CookiePLMonster/mm3-fixes 

Miscellaneous Direct3D LTCG fixes
This commit is contained in:
PatrickvL 2020-11-02 18:36:08 +01:00 committed by GitHub
parent 38242d48f9 2875342b5c
commit 97bf1d9169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 376 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
import/XbSymbolDatabase

@ -1 +1 @@
Subproject commit e6df7d42775fc35ae0dec546f94c5c40452cec02
Subproject commit b20e55df4087606e21a865a707c6fa4a5a01bd50

2
import/subhook

@ -1 +1 @@
Subproject commit 29cb47ea7674b36cf2b742c11cf2568add1f47fc
Subproject commit 1420130730c62485624e958076ccb0f1923e6b89

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

@ -204,6 +204,7 @@ static LRESULT WINAPI EmuMsgProc(HWND hWnd, UINT msg, WPARAM wPara
static DWORD WINAPI EmuUpdateTickCount(LPVOID);
static inline void EmuVerifyResourceIsRegistered(xbox::X_D3DResource *pResource, DWORD D3DUsage, int iTextureStage, DWORD dwSize);
static void UpdateCurrentMSpFAndFPS(); // Used for benchmarking/fps count
static void CxbxImpl_SetRenderTarget(xbox::X_D3DSurface *pRenderTarget, xbox::X_D3DSurface *pNewZStencil);
extern void UpdateFPSCounter();
@ -268,6 +269,7 @@ g_EmuCDPD = {0};
#define XB_TRAMPOLINES(XB_MACRO) \
XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_CreateVertexShader, (CONST xbox::dword_xt*, CONST xbox::dword_xt*, xbox::dword_xt*, xbox::dword_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_DeleteVertexShader, (xbox::dword_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_DeleteVertexShader_0, () ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_GetBackBuffer, (xbox::int_xt, D3DBACKBUFFER_TYPE, xbox::X_D3DSurface**) ); \
XB_MACRO(xbox::X_D3DSurface*, WINAPI, D3DDevice_GetBackBuffer2, (xbox::int_xt) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, D3DDevice_GetDepthStencilSurface, (xbox::X_D3DSurface**) ); \
@ -293,6 +295,7 @@ g_EmuCDPD = {0};
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetPixelShader_0, () ); \
XB_MACRO(xbox::void_xt, __fastcall, D3DDevice_SetRenderState_Simple, (xbox::dword_xt, xbox::dword_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetRenderTarget, (xbox::X_D3DSurface*, xbox::X_D3DSurface*) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetRenderTarget_0, () ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource, (xbox::uint_xt, xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource_4, (xbox::uint_xt, xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3DDevice_SetStreamSource_8, (xbox::X_D3DVertexBuffer*, xbox::uint_xt) ); \
@ -309,10 +312,12 @@ g_EmuCDPD = {0};
XB_MACRO(xbox::void_xt, WINAPI, D3D_DestroyResource, (xbox::X_D3DResource*) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3D_DestroyResource__LTCG, (xbox::void_xt) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::dword_xt, xbox::X_D3DPRESENT_PARAMETERS*, IDirect3DDevice**) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_16, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::X_D3DPRESENT_PARAMETERS*) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::X_D3DPRESENT_PARAMETERS*) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface, (xbox::uint_xt, D3DDEVTYPE, HWND, xbox::X_D3DPRESENT_PARAMETERS*) ); \
XB_MACRO(xbox::hresult_xt, WINAPI, Direct3D_CreateDevice_4, (xbox::X_D3DPRESENT_PARAMETERS*) ); \
XB_MACRO(xbox::void_xt, WINAPI, Lock2DSurface, (xbox::X_D3DPixelContainer*, D3DCUBEMAP_FACES, xbox::uint_xt, D3DLOCKED_RECT*, RECT*, xbox::dword_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, Lock3DSurface, (xbox::X_D3DPixelContainer*, xbox::uint_xt, D3DLOCKED_BOX*, D3DBOX*, xbox::dword_xt) ); \
XB_MACRO(xbox::void_xt, WINAPI, D3D_CommonSetRenderTarget, (xbox::X_D3DSurface*, xbox::X_D3DSurface*, void*) ); \
XB_TRAMPOLINES(XB_trampoline_declare);
@ -3143,10 +3148,25 @@ void Direct3D_CreateDevice_End()
}
}
// Overload for logging
static void Direct3D_CreateDevice_4
(
xbox::dword_xt BehaviorFlags,
xbox::X_D3DPRESENT_PARAMETERS *pPresentationParameters,
IDirect3DDevice **ppReturnedDeviceInterface
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(BehaviorFlags)
LOG_FUNC_ARG(pPresentationParameters)
LOG_FUNC_ARG_OUT(ppReturnedDeviceInterface)
LOG_FUNC_END;
}
// LTCG specific Direct3D_CreateDevice function...
// This uses a custom calling with parameters passed in eax, ecx and the stack
// This uses a custom calling with parameters passed in EAX, ECX and the stack
// Test-case: Ninja Gaiden, Halo 2
xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4)
__declspec(naked) xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4)
(
X_D3DPRESENT_PARAMETERS *pPresentationParameters
)
@ -3155,58 +3175,178 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_4)
IDirect3DDevice **ppReturnedDeviceInterface;
__asm {
mov BehaviorFlags, eax
mov ppReturnedDeviceInterface, ecx
}
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov BehaviorFlags, eax
mov ppReturnedDeviceInterface, ecx
}
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pPresentationParameters)
LOG_FUNC_END;
// Log
Direct3D_CreateDevice_4(BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
Direct3D_CreateDevice_Start(pPresentationParameters);
hresult_xt hRet = 0;
// Only then call Xbox CreateDevice function
__asm {
mov eax, BehaviorFlags
mov ecx, ppReturnedDeviceInterface
push pPresentationParameters
call XB_TRMP(Direct3D_CreateDevice_4)
mov hRet, eax
}
hresult_xt hRet;
__asm {
push pPresentationParameters
mov eax, BehaviorFlags
mov ecx, ppReturnedDeviceInterface
call XB_TRMP(Direct3D_CreateDevice_4)
mov hRet, eax
}
Direct3D_CreateDevice_End();
return hRet;
__asm {
mov eax, hRet
mov esp, ebp
pop ebp
ret 4
}
}
// LTCG specific Direct3D_CreateDevice function...
// This uses a custom calling convention passed unknown parameters
// Test-case: Battle Engine Aquila
xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16)
// Overload for logging
static void Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface
(
uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
X_D3DPRESENT_PARAMETERS *pPresentationParameters
xbox::uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
xbox::dword_xt BehaviorFlags,
xbox::X_D3DPRESENT_PARAMETERS *pPresentationParameters,
IDirect3DDevice **ppReturnedDeviceInterface
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(Adapter)
LOG_FUNC_ARG(DeviceType)
LOG_FUNC_ARG(hFocusWindow)
LOG_FUNC_ARG(BehaviorFlags)
LOG_FUNC_ARG(pPresentationParameters)
LOG_FUNC_ARG_OUT(ppReturnedDeviceInterface)
LOG_FUNC_END;
}
// LTCG specific Direct3D_CreateDevice function...
// This uses a custom calling convention passing parameters on stack, in EAX and ECX
// Test-case: Aggressive Inline, Midtown Madness 3
__declspec(naked) xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface)
(
uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
X_D3DPRESENT_PARAMETERS *pPresentationParameters
)
{
dword_xt BehaviorFlags;
IDirect3DDevice **ppReturnedDeviceInterface;
__asm {
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov BehaviorFlags, eax
mov ppReturnedDeviceInterface, ecx
}
// Log
Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
Direct3D_CreateDevice_Start(pPresentationParameters);
// Only then call Xbox CreateDevice function
hresult_xt hRet = XB_TRMP(Direct3D_CreateDevice_16)(Adapter, DeviceType, hFocusWindow, pPresentationParameters);
hresult_xt hRet;
__asm {
push pPresentationParameters
push hFocusWindow
push DeviceType
push Adapter
mov eax, BehaviorFlags
mov ecx, ppReturnedDeviceInterface
call XB_TRMP(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface)
mov hRet, eax
}
Direct3D_CreateDevice_End();
return hRet;
__asm {
mov eax, hRet
mov esp, ebp
pop ebp
ret 10h
}
}
// Overload for logging
static void Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface
(
xbox::uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
xbox::dword_xt BehaviorFlags,
xbox::X_D3DPRESENT_PARAMETERS *pPresentationParameters,
IDirect3DDevice **ppReturnedDeviceInterface
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(Adapter)
LOG_FUNC_ARG(DeviceType)
LOG_FUNC_ARG(hFocusWindow)
LOG_FUNC_ARG(BehaviorFlags)
LOG_FUNC_ARG(pPresentationParameters)
LOG_FUNC_ARG_OUT(ppReturnedDeviceInterface)
LOG_FUNC_END;
}
// LTCG specific Direct3D_CreateDevice function...
// This uses a custom calling convention passing parameters on stack, in EAX and EBX
// Test-case: NASCAR Heat 2002
__declspec(naked) xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface)
(
uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
X_D3DPRESENT_PARAMETERS *pPresentationParameters
)
{
dword_xt BehaviorFlags;
IDirect3DDevice **ppReturnedDeviceInterface;
__asm {
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov BehaviorFlags, eax
mov ppReturnedDeviceInterface, ebx
}
// Log
Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface);
Direct3D_CreateDevice_Start(pPresentationParameters);
// Only then call Xbox CreateDevice function
hresult_xt hRet;
__asm {
push pPresentationParameters
push hFocusWindow
push DeviceType
push Adapter
mov eax, BehaviorFlags
mov ebx, ppReturnedDeviceInterface
call XB_TRMP(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface)
mov hRet, eax
}
Direct3D_CreateDevice_End();
__asm {
mov eax, hRet
mov esp, ebp
pop ebp
ret 10h
}
}
// ******************************************************************
@ -3274,9 +3414,9 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(Direct3D_CreateDevice)
LOG_FUNC_ARG(Adapter)
LOG_FUNC_ARG(DeviceType)
LOG_FUNC_ARG(hFocusWindow)
LOG_FUNC_ARG(BehaviorFlags) // Xbox ignores BehaviorFlags
LOG_FUNC_ARG(BehaviorFlags)
LOG_FUNC_ARG(pPresentationParameters)
LOG_FUNC_ARG(ppReturnedDeviceInterface)
LOG_FUNC_ARG_OUT(ppReturnedDeviceInterface)
LOG_FUNC_END;
Direct3D_CreateDevice_Start(pPresentationParameters);
@ -3321,7 +3461,7 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_Reset)
// Refresh the current render target and depth stencil, to apply changes made within D3DDevice_Reset
// Some XDKs do this for us, but not all do!
EMUPATCH(D3DDevice_SetRenderTarget)(g_pXbox_RenderTarget, g_pXbox_DepthStencil);
CxbxImpl_SetRenderTarget(g_pXbox_RenderTarget, g_pXbox_DepthStencil);
return hRet;
}
@ -5216,6 +5356,7 @@ xbox::dword_xt WINAPI xbox::EMUPATCH(D3DDevice_Swap)
/*Z=*/g_bHasDepth ? 1.0f : 0.0f,
/*Stencil=*/0);
g_pD3DDevice->SetRenderTarget(0, pExistingRenderTarget);
pExistingRenderTarget->Release();
}
// TODO: Implement a hot-key to change the filter?
@ -7300,7 +7441,7 @@ void CxbxImpl_InsertCallback
}
}
xbox::void_xt __declspec(noinline) D3DDevice_SetPixelShaderCommon(xbox::dword_xt Handle)
xbox::void_xt CxbxImpl_SetPixelShader(xbox::dword_xt Handle)
{
// Cache the active shader handle
g_pXbox_PixelShader = (xbox::X_PixelShader*)Handle;
@ -7318,33 +7459,47 @@ xbox::void_xt __declspec(noinline) D3DDevice_SetPixelShaderCommon(xbox::dword_xt
}
}
// Overload for logging
static void D3DDevice_SetPixelShader_0
(
xbox::dword_xt Handle
)
{
LOG_FUNC_ONE_ARG(Handle);
}
// LTCG specific D3DDevice_SetPixelShader function...
// This uses a custom calling convention where parameter is passed in EAX
// Test-case: Metal Wolf Chaos
// Test-case: Lord of the Rings: The Third Age
xbox::void_xt WINAPI D3DDevice_SetPixelShader_0_IMPL
(
xbox::dword_xt Handle
)
// Test-case: Midtown Madness 3
__declspec(naked) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader_0)()
{
LOG_FUNC_ONE_ARG(Handle);
dword_xt Handle;
// prologue
__asm {
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov Handle, eax
}
// Call the Xbox function to make sure D3D structures get set
__asm {
mov eax, Handle
call XB_TRMP(D3DDevice_SetPixelShader_0)
}
// Log
D3DDevice_SetPixelShader_0(Handle);
D3DDevice_SetPixelShaderCommon(Handle);
}
__asm {
mov eax, Handle
call XB_TRMP(D3DDevice_SetPixelShader_0)
}
xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader_0)()
{
__asm {
push eax
call D3DDevice_SetPixelShader_0_IMPL
ret
}
CxbxImpl_SetPixelShader(Handle);
// epilogue
__asm {
mov esp, ebp
pop ebp
ret
}
}
// ******************************************************************
@ -7360,7 +7515,7 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetPixelShader)
// Call the Xbox function to make sure D3D structures get set
XB_TRMP(D3DDevice_SetPixelShader)(Handle);
D3DDevice_SetPixelShaderCommon(Handle);
CxbxImpl_SetPixelShader(Handle);
}
// ******************************************************************
@ -7774,25 +7929,21 @@ xbox::hresult_xt WINAPI xbox::EMUPATCH(D3DDevice_LightEnable)
return hRet;
}
// ******************************************************************
// * patch: D3DDevice_SetRenderTarget
// ******************************************************************
xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget)
// SetRenderTarget can call CommonSetRenderTarget, nested call detection is required
// Test case: Midtown Madness 3
static thread_local uint32_t setRenderTargetCount = 0;
static void CxbxImpl_SetRenderTarget
(
X_D3DSurface *pRenderTarget,
X_D3DSurface *pNewZStencil
xbox::X_D3DSurface *pRenderTarget,
xbox::X_D3DSurface *pNewZStencil
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pRenderTarget)
LOG_FUNC_ARG(pNewZStencil)
LOG_FUNC_END;
LOG_INIT;
IDirect3DSurface *pHostRenderTarget = nullptr;
IDirect3DSurface *pHostDepthStencil = nullptr;
XB_TRMP(D3DDevice_SetRenderTarget)(pRenderTarget, pNewZStencil);
// In Xbox titles, CreateDevice calls SetRenderTarget for the back buffer
// We can use this to determine the Xbox backbuffer surface for later use!
if (g_pXbox_BackBufferSurface == xbox::zeroptr) {
@ -7856,6 +8007,106 @@ xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget)
CalculateMultiSampleScaleForRenderTarget(pRenderTarget);
}
// ******************************************************************
// * patch: D3DDevice_SetRenderTarget
// ******************************************************************
xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget)
(
X_D3DSurface *pRenderTarget,
X_D3DSurface *pNewZStencil
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pRenderTarget)
LOG_FUNC_ARG(pNewZStencil)
LOG_FUNC_END;
NestedPatchCounter call(setRenderTargetCount);
XB_TRMP(D3DDevice_SetRenderTarget)(pRenderTarget, pNewZStencil);
CxbxImpl_SetRenderTarget(pRenderTarget, pNewZStencil);
}
// LTCG specific D3DDevice_SetRenderTarget function...
// Passes pRenderTarget in ecx and pNewZStencil in eax
static void D3DDevice_SetRenderTarget_0
(
xbox::X_D3DSurface *pRenderTarget,
xbox::X_D3DSurface *pNewZStencil
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pRenderTarget)
LOG_FUNC_ARG(pNewZStencil)
LOG_FUNC_END;
NestedPatchCounter call(setTransformCount);
__asm {
mov ecx, pRenderTarget
mov eax, pNewZStencil
call XB_TRMP(D3DDevice_SetRenderTarget_0)
}
CxbxImpl_SetRenderTarget(pRenderTarget, pNewZStencil);
}
__declspec(naked) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_SetRenderTarget_0)
(
)
{
X_D3DSurface *pRenderTarget;
X_D3DSurface *pNewZStencil;
// prologue
__asm {
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov pRenderTarget, ecx
mov pNewZStencil, eax
}
// Actual function body
D3DDevice_SetRenderTarget_0(pRenderTarget, pNewZStencil);
// epilogue
__asm {
mov esp, ebp
pop ebp
ret
}
}
// ******************************************************************
// * patch: D3D_CommonSetRenderTarget
// ******************************************************************
// This is an internal function, but some LTCG games inline SetRenderTarget and call it directly
// Test-case: Midtown Madness 3
xbox::void_xt WINAPI xbox::EMUPATCH(D3D_CommonSetRenderTarget)
(
X_D3DSurface *pRenderTarget,
X_D3DSurface *pNewZStencil,
void *unknown
)
{
LOG_FUNC_BEGIN
LOG_FUNC_ARG(pRenderTarget)
LOG_FUNC_ARG(pNewZStencil)
LOG_FUNC_ARG(unknown)
LOG_FUNC_END;
NestedPatchCounter call(setRenderTargetCount);
XB_TRMP(D3D_CommonSetRenderTarget)(pRenderTarget, pNewZStencil, unknown);
if (call.GetLevel() == 0) {
CxbxImpl_SetRenderTarget(pRenderTarget, pNewZStencil);
}
}
// LTCG specific D3DDevice_SetPalette function...
// This uses a custom calling convention where parameter is passed in EAX
// Test-case: Ninja Gaiden
@ -7947,21 +8198,45 @@ void WINAPI xbox::EMUPATCH(D3DDevice_SetSoftDisplayFilter)
LOG_IGNORED();
}
// Overload for logging
static void D3DDevice_DeleteVertexShader_0
(
xbox::dword_xt Handle
)
{
LOG_FUNC_ONE_ARG(Handle);
}
// LTCG specific D3DDevice_DeleteVertexShader function...
// This uses a custom calling convention where parameter is passed in EAX
// UNTESTED - Need test-case!
xbox::void_xt __stdcall xbox::EMUPATCH(D3DDevice_DeleteVertexShader_0)
// Test-case: Midtown Madness 3
__declspec(naked) xbox::void_xt WINAPI xbox::EMUPATCH(D3DDevice_DeleteVertexShader_0)
(
)
{
dword_xt Handle;
__asm {
mov Handle, eax
push ebp
mov ebp, esp
sub esp, __LOCAL_SIZE
mov Handle, eax
}
LOG_TEST_CASE("Validate this function!");
return EMUPATCH(D3DDevice_DeleteVertexShader)(Handle);
// Log
D3DDevice_DeleteVertexShader_0(Handle);
CxbxImpl_DeleteVertexShader(Handle);
// When deleting, call trampoline *after* our implementation,
// so that we can still access it's fields before it gets deleted!
__asm {
mov eax, Handle
call XB_TRMP(D3DDevice_DeleteVertexShader_0)
mov esp, ebp
pop ebp
ret
}
}
// ******************************************************************

27
src/core/hle/D3D8/Direct3D9/Direct3D9.h
View File

@ -92,7 +92,15 @@ xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice)
IDirect3DDevice **ppReturnedDeviceInterface
);
xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice_16)
xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface)
(
uint_xt Adapter,
D3DDEVTYPE DeviceType,
HWND hFocusWindow,
X_D3DPRESENT_PARAMETERS *pPresentationParameters
);
xbox::hresult_xt WINAPI EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface)
(
uint_xt Adapter,
D3DDEVTYPE DeviceType,
@ -1512,6 +1520,21 @@ xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderTarget)
X_D3DSurface *pNewZStencil
);
// ******************************************************************
// * patch: D3DDevice_SetRenderTarget_0
// ******************************************************************
xbox::void_xt WINAPI EMUPATCH(D3DDevice_SetRenderTarget_0)();
// ******************************************************************
// * patch: D3D_CommonSetRenderTarget
// ******************************************************************
xbox::void_xt WINAPI EMUPATCH(D3D_CommonSetRenderTarget)
(
X_D3DSurface *pRenderTarget,
X_D3DSurface *pNewZStencil,
void *unknown
);
// ******************************************************************
// * patch: D3DDevice_SetPalette
// ******************************************************************
@ -1577,7 +1600,7 @@ xbox::void_xt WINAPI EMUPATCH(D3DDevice_DeleteVertexShader)
dword_xt Handle
);
xbox::void_xt __stdcall EMUPATCH(D3DDevice_DeleteVertexShader_0)();
xbox::void_xt WINAPI EMUPATCH(D3DDevice_DeleteVertexShader_0)();
// ******************************************************************
// * patch: D3DDevice_SelectVertexShaderDirect

5
src/core/hle/Patches.cpp
View File

@ -138,6 +138,7 @@ std::map<const std::string, const xbox_patch_t> g_PatchTable = {
PATCH_ENTRY("D3DDevice_SetRenderState_Simple", xbox::EMUPATCH(D3DDevice_SetRenderState_Simple), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetRenderTarget", xbox::EMUPATCH(D3DDevice_SetRenderTarget), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetRenderTargetFast", xbox::EMUPATCH(D3DDevice_SetRenderTargetFast), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetRenderTarget_0", xbox::EMUPATCH(D3DDevice_SetRenderTarget_0), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetScreenSpaceOffset", xbox::EMUPATCH(D3DDevice_SetScreenSpaceOffset), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetShaderConstantMode", xbox::EMUPATCH(D3DDevice_SetShaderConstantMode), PATCH_HLE_D3D),
PATCH_ENTRY("D3DDevice_SetShaderConstantMode_0", xbox::EMUPATCH(D3DDevice_SetShaderConstantMode_0), PATCH_HLE_D3D),
@ -182,12 +183,14 @@ std::map<const std::string, const xbox_patch_t> g_PatchTable = {
PATCH_ENTRY("D3DResource_BlockUntilNotBusy", xbox::EMUPATCH(D3DResource_BlockUntilNotBusy), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_BlockOnTime", xbox::EMUPATCH(D3D_BlockOnTime), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_BlockOnTime_4", xbox::EMUPATCH(D3D_BlockOnTime_4), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_CommonSetRenderTarget", xbox::EMUPATCH(D3D_CommonSetRenderTarget), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_DestroyResource", xbox::EMUPATCH(D3D_DestroyResource), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_DestroyResource__LTCG", xbox::EMUPATCH(D3D_DestroyResource__LTCG), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_LazySetPointParams", xbox::EMUPATCH(D3D_LazySetPointParams), PATCH_HLE_D3D),
PATCH_ENTRY("D3D_SetCommonDebugRegisters", xbox::EMUPATCH(D3D_SetCommonDebugRegisters), PATCH_HLE_D3D),
PATCH_ENTRY("Direct3D_CreateDevice", xbox::EMUPATCH(Direct3D_CreateDevice), PATCH_HLE_D3D),
PATCH_ENTRY("Direct3D_CreateDevice_16", xbox::EMUPATCH(Direct3D_CreateDevice_16), PATCH_HLE_D3D),
PATCH_ENTRY("Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface", xbox::EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ebx_ppReturnedDeviceInterface), PATCH_HLE_D3D),
PATCH_ENTRY("Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface", xbox::EMUPATCH(Direct3D_CreateDevice_16__LTCG_eax_BehaviorFlags_ecx_ppReturnedDeviceInterface), PATCH_HLE_D3D),
PATCH_ENTRY("Direct3D_CreateDevice_4", xbox::EMUPATCH(Direct3D_CreateDevice_4), PATCH_HLE_D3D),
PATCH_ENTRY("Lock2DSurface", xbox::EMUPATCH(Lock2DSurface), PATCH_HLE_D3D),
PATCH_ENTRY("Lock3DSurface", xbox::EMUPATCH(Lock3DSurface), PATCH_HLE_D3D),