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

Fix patch on release build

This commit is contained in:
jarupxx 2018-04-11 20:12:50 +09:00
parent 3b99ed721d
commit ff0f043faf
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -3367,7 +3367,7 @@ VOID __fastcall XTL::EMUPATCH(D3DDevice_SetVertexShaderConstantNotInlineFast)
BOOL g_bBadIndexData = FALSE; BOOL g_bBadIndexData = FALSE;
// LTCG specific D3DDevice_SetTexture function... // LTCG specific D3DDevice_SetTexture function...
// This function is still not working so should be investigated. // This uses a custom calling convention where parameter is passed in EAX
// Test-case: Metal Wolf Chaos // Test-case: Metal Wolf Chaos
VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTexture_4) VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTexture_4)
( (
@ -3377,8 +3377,11 @@ VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTexture_4)
static uint32 returnAddr; static uint32 returnAddr;
#ifdef _DEBUG_TRACE
__asm add esp, 4
#endif
__asm { __asm {
add esp, 4
pop returnAddr pop returnAddr
push eax push eax
call EmuPatch_D3DDevice_SetTexture call EmuPatch_D3DDevice_SetTexture
@ -4821,7 +4824,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetVerticalBlankCallback)
} }
// LTCG specific D3DDevice_SetTextureState_TexCoordIndex function... // LTCG specific D3DDevice_SetTextureState_TexCoordIndex function...
// TODO: This function works only on debug build, should be fix on release build. // This uses a custom calling convention where parameter is passed in ESI
// Test-case: Metal Wolf Chaos // Test-case: Metal Wolf Chaos
VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_4) VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_4)
( (
@ -4831,8 +4834,11 @@ VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_TexCoordIndex_4)
static uint32 returnAddr; static uint32 returnAddr;
#ifdef _DEBUG_TRACE
__asm add esp, 4
#endif
__asm { __asm {
add esp, 4
pop returnAddr pop returnAddr
push esi push esi
call EmuPatch_D3DDevice_SetTextureState_TexCoordIndex call EmuPatch_D3DDevice_SetTextureState_TexCoordIndex
@ -4912,7 +4918,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_BackFillMode)
} }
// LTCG specific D3DDevice_SetTextureState_BorderColor function... // LTCG specific D3DDevice_SetTextureState_BorderColor function...
// This uses a custom calling convention where parameter is passed in EAB, EBX // This uses a custom calling convention where parameter is passed in EAX, EBX
// Test-case: Metal Wolf Chaos // Test-case: Metal Wolf Chaos
VOID XTL::EMUPATCH(D3DDevice_SetTextureState_BorderColor_0) VOID XTL::EMUPATCH(D3DDevice_SetTextureState_BorderColor_0)
( (
@ -4954,7 +4960,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_BorderColor)
} }
// LTCG specific D3DDevice_SetTextureState_ColorKeyColor function... // LTCG specific D3DDevice_SetTextureState_ColorKeyColor function...
// This uses a custom calling convention where parameter is passed in EAX, EBX // This uses a custom calling convention where parameter is passed in ESI, EBX
// Test-case: Metal Wolf Chaos // Test-case: Metal Wolf Chaos
VOID XTL::EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_0) VOID XTL::EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_0)
( (
@ -4964,7 +4970,7 @@ VOID XTL::EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor_0)
DWORD Stage; DWORD Stage;
__asm { __asm {
mov Stage, eax; mov Stage, esi;
} }
DWORD Value; DWORD Value;
@ -4995,7 +5001,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetTextureState_ColorKeyColor)
} }
// LTCG specific D3DDevice_SetTextureState_BumpEnv function... // LTCG specific D3DDevice_SetTextureState_BumpEnv function...
// TODO: This function works only on debug build, should be fix on release build. // This uses a custom calling convention where parameter is passed in EAX
// Test-case: Metal Wolf Chaos // Test-case: Metal Wolf Chaos
VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_BumpEnv_8) VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_BumpEnv_8)
( (
@ -5005,8 +5011,11 @@ VOID __stdcall XTL::EMUPATCH(D3DDevice_SetTextureState_BumpEnv_8)
static uint32 returnAddr; static uint32 returnAddr;
#ifdef _DEBUG_TRACE
__asm add esp, 4
#endif
__asm { __asm {
add esp, 4
pop returnAddr pop returnAddr
push eax push eax
call EmuPatch_D3DDevice_SetTextureState_BumpEnv call EmuPatch_D3DDevice_SetTextureState_BumpEnv