From e59bd752c8282095475996e0287780658cf02c71 Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Mon, 10 Apr 2017 08:44:32 +0200 Subject: [PATCH] D3D_SetPushBufferSize patch disabled everywhere --- src/CxbxKrnl/EmuD3D8.cpp | 2 ++ src/CxbxKrnl/EmuD3D8.h | 2 ++ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl | 2 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index c2d56a5fe..2d227401b 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -9109,6 +9109,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_GetDeviceCaps) return hRet; } +#if 0 // patch disabled // ****************************************************************** // * patch: D3D_SetPushBufferSize // ****************************************************************** @@ -9135,6 +9136,7 @@ HRESULT WINAPI XTL::EMUPATCH(D3D_SetPushBufferSize) return hRet; } +#endif // ****************************************************************** // * patch: D3DDevice_InsertFence diff --git a/src/CxbxKrnl/EmuD3D8.h b/src/CxbxKrnl/EmuD3D8.h index f837befca..ebb37c479 100644 --- a/src/CxbxKrnl/EmuD3D8.h +++ b/src/CxbxKrnl/EmuD3D8.h @@ -1569,6 +1569,7 @@ HRESULT WINAPI EMUPATCH(D3D_GetDeviceCaps) D3DCAPS8 *pCaps ); +#if 0 // patch disabled // ****************************************************************** // * patch: D3D_SetPushBufferSize // ****************************************************************** @@ -1577,6 +1578,7 @@ HRESULT WINAPI EMUPATCH(D3D_SetPushBufferSize) DWORD PushBufferSize, DWORD KickOffSize ); +#endif // ****************************************************************** // * patch: D3DDevice_InsertFence diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index ad64be5a7..038fb5464 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -1577,7 +1577,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5233, PATCH), REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED), - REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, PATCH), + REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, DISABLED), REGISTER_OOVPA(D3DDevice_DrawVertices, 5233, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 5233, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index c0e73568e..2c9670386 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -1349,7 +1349,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_LightEnable, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 5558, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, PATCH), + REGISTER_OOVPA(D3D_SetPushBufferSize, 5558, DISABLED), REGISTER_OOVPA(D3D_CheckDeviceMultiSampleType, 5558, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED), REGISTER_OOVPA(D3DDevice_DrawVertices, 5788, PATCH),