From 4a480465c0d995f8843aa0b7bb62964d0e381c93 Mon Sep 17 00:00:00 2001 From: jarupxx Date: Mon, 16 Oct 2017 20:28:22 +0900 Subject: [PATCH] Update D3D Database - D3D_Unknown 5788 is D3DDevice_MakeSpace, meaged to D3DDevice_MakeSpace 4134 version. - Improved signature D3DDevice_End D3DDevice_EndVisibilityTest D3DDevice_SetRenderState_MultiSampleRenderTargetMode D3DVertexBuffer_Lock D3DVertexBuffer_Lock2 D3DVertexBuffer_Lock --- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl | 90 +++++++++++++++++++++- src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl | 53 +++++++------ src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl | 36 ++++++++- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl | 21 ++++- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl | 2 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl | 2 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl | 6 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl | 9 ++- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl | 4 +- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl | 29 ++++++- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl | 14 ++++ src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl | 14 ++-- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl | 27 ++++--- src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl | 14 ++-- src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl | 18 ++--- 15 files changed, 266 insertions(+), 73 deletions(-) diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl index 504ba5773..8604c65bf 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl @@ -1155,6 +1155,38 @@ OOVPA_NO_XREF(D3DDevice_GetMaterial, 3911, 9) { 0x1A, 0xC2 }, OOVPA_END; +// ****************************************************************** +// * D3DDevice_EndVisibilityTest +// ****************************************************************** +//Generic OOVPA as of 3911 and newer. +OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 3911, 21) + + { 0x00, 0x8B }, + { 0x06, 0xE8 }, + + { 0x0B, 0x8B }, + { 0x0C, 0xF0 }, + { 0x0D, 0x85 }, + { 0x0E, 0xF6 }, + { 0x0F, 0x75 }, + { 0x10, 0x09 }, + { 0x11, 0xB8 }, + { 0x12, 0x0E }, + { 0x13, 0x00 }, + { 0x14, 0x07 }, + { 0x15, 0x80 }, + { 0x16, 0x5E }, + { 0x17, 0xC2 }, + { 0x18, 0x04 }, + { 0x19, 0x00 }, + { 0x1A, 0x57 }, + { 0x1B, 0x8B }, + { 0x1C, 0x3D }, + + { 0x37, 0x00 }, +OOVPA_END; + +#if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3DDevice_EndVisibilityTest // ****************************************************************** @@ -1179,6 +1211,7 @@ OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 3911, 13) { 0x44, 0xC0 }, { 0x45, 0x0C }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_GetVisibilityTestResult @@ -1713,7 +1746,10 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(D3DDevice_End, 3911, 12) +OOVPA_NO_XREF(D3DDevice_End, 3911, 13) + + // D3DDevice_End+0x00 : push esi + { 0x00, 0x56 }, // D3DDevice_End+0x17 : mov dword ptr [eax], 0x417FC { 0x17, 0xC7 }, @@ -3419,6 +3455,28 @@ OOVPA_NO_XREF(D3DResource_GetType, 3911, 7) { 0x91, 0x00 }, OOVPA_END; +// ****************************************************************** +// * D3D_AllocContiguousMemory +// ****************************************************************** +OOVPA_NO_XREF(D3D_AllocContiguousMemory, 3911, 14) + + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x08 }, + { 0x04, 0x8B }, + { 0x05, 0x4C }, + { 0x06, 0x24 }, + { 0x07, 0x04 }, + { 0x08, 0x68 }, + { 0x09, 0x04 }, + { 0x0A, 0x04 }, + { 0x0B, 0x00 }, + { 0x0C, 0x00 }, + { 0x0D, 0x50 }, +OOVPA_END; + +#if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3D_AllocContiguousMemory // ****************************************************************** @@ -3431,6 +3489,7 @@ OOVPA_NO_XREF(D3D_AllocContiguousMemory, 3911, 6) { 0x16, 0xC2 }, { 0x17, 0x08 }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_SetRenderState_Deferred @@ -4471,3 +4530,32 @@ OOVPA_NO_XREF(D3D_GetAdapterModeCount, 3911, 20) { 0x40, 0x14 }, { 0x41, 0xEB }, OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DeletePatch +// ****************************************************************** +// Generic OOVPA as of 3911 and newer. +OOVPA_NO_XREF(D3DDevice_DeletePatch, 3911, 19) + + { 0x00, 0x8B }, + { 0x05, 0x0D }, + { 0x0C, 0xA1 }, + + { 0x11, 0x56 }, + { 0x12, 0x8B }, + { 0x13, 0x34 }, + { 0x14, 0x88 }, + { 0x15, 0x85 }, + { 0x16, 0xF6 }, + { 0x17, 0x74 }, + { 0x18, 0x17 }, + { 0x19, 0x8B }, + { 0x1A, 0x4E }, + { 0x1B, 0x04 }, + { 0x1C, 0xC7 }, + { 0x1D, 0x04 }, + { 0x1E, 0x88 }, + { 0x1F, 0x00 }, + + { 0x25, 0xE8 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index f8d862217..bb43c103d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -32,6 +32,32 @@ // * // ****************************************************************** +// ****************************************************************** +// * D3DDevice_SetRenderState_MultiSampleMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 3925, 12) + + // D3DDevice_SetRenderState_MultiSampleMode+0x05 : mov ecx, [esp+4] + { 0x05, 0x8B }, + { 0x06, 0x4C }, + { 0x07, 0x24 }, + { 0x08, 0x04 }, + + // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov edx, [eax+0x410] + { 0x0F, 0x8B }, + { 0x10, 0x90 }, + { 0x11, 0x10 }, + { 0x12, 0x04 }, + + // D3DDevice_SetRenderState_MultiSampleMode+0x15 : mov eax, [eax+0x40C] + { 0x15, 0x8B }, + { 0x16, 0x80 }, + + // D3DDevice_SetRenderState_MultiSampleMode+0x22 : retn 0x04 + { 0x22, 0xC2 }, + { 0x23, 0x04 }, +OOVPA_END; + #if 0 // Moved to 3911 // ****************************************************************** // * Direct3D_CreateDevice @@ -2715,33 +2741,6 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask, 3925, 13) { 0x4A, 0x04 }, OOVPA_END; #endif - -// ****************************************************************** -// * D3DDevice_SetRenderState_MultiSampleMode -// ****************************************************************** -OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 3925, 12) - - // D3DDevice_SetRenderState_MultiSampleMode+0x05 : mov ecx, [esp+4] - { 0x05, 0x8B }, - { 0x06, 0x4C }, - { 0x07, 0x24 }, - { 0x08, 0x04 }, - - // D3DDevice_SetRenderState_MultiSampleMode+0x0F : mov edx, [eax+0x410] - { 0x0F, 0x8B }, - { 0x10, 0x90 }, - { 0x11, 0x10 }, - { 0x12, 0x04 }, - - // D3DDevice_SetRenderState_MultiSampleMode+0x15 : mov eax, [eax+0x40C] - { 0x15, 0x8B }, - { 0x16, 0x80 }, - - // D3DDevice_SetRenderState_MultiSampleMode+0x22 : retn 0x04 - { 0x22, 0xC2 }, - { 0x23, 0x04 }, -OOVPA_END; - #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_PersistDisplay diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index fd185872a..693bf4b6a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -258,6 +258,7 @@ OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest, 4034, 7) { 0x28, 0x06 }, OOVPA_END; +#if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3DDevice_EndVisibilityTest // ****************************************************************** @@ -271,6 +272,7 @@ OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 4034, 7) { 0x46, 0x89 }, { 0x55, 0x5F }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_CopyRects @@ -287,6 +289,7 @@ OOVPA_NO_XREF(D3DDevice_CopyRects, 4034, 8) { 0xFE, 0x14 }, OOVPA_END; +#if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3DDevice_DeletePatch // ****************************************************************** @@ -300,6 +303,7 @@ OOVPA_NO_XREF(D3DDevice_DeletePatch, 4034, 7) { 0x2A, 0x56 }, { 0x30, 0x5E }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_DrawIndexedVertices @@ -1474,6 +1478,32 @@ OOVPA_NO_XREF(D3DDevice_SetVertexDataColor, 4039, 13) { 0x25, 0x0F }, OOVPA_END; +// ****************************************************************** +// * D3DDevice_End +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_End, 4039, 16) // Up to 5233 + + { 0x01, 0x8B }, + { 0x07, 0x8B }, + { 0x0E, 0xE8 }, + { 0x16, 0x17 }, + { 0x1E, 0x00 }, + + { 0x22, 0x08 }, + { 0x23, 0x89 }, + { 0x24, 0x06 }, + { 0x25, 0x8B }, + { 0x26, 0x46 }, + { 0x27, 0x08 }, + { 0x28, 0xF6 }, + { 0x29, 0xC4 }, + + { 0x2E, 0x01 }, + { 0x36, 0x08 }, + { 0x3C, 0xC3 }, +OOVPA_END; + +#if 0 // No longer used, replaced by generic 4039 version // ****************************************************************** // * D3DDevice_End // ****************************************************************** @@ -1486,7 +1516,7 @@ OOVPA_NO_XREF(D3DDevice_End, 4039, 7) { 0x2E, 0x01 }, { 0x36, 0x08 }, OOVPA_END; - +#endif // ****************************************************************** // * D3DDevice_SetFlickerFilter @@ -2398,9 +2428,9 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePatch, 4034, DISABLED), // (TODO) + REGISTER_OOVPA(D3DDevice_DeletePatch, 3911, DISABLED), // (TODO) REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 037e3d3b2..4ec9931ca 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -2698,6 +2698,25 @@ OOVPA_NO_XREF(D3DDevice_SetBackBufferScale, 4134, 16) { 0x2E, 0x0F }, OOVPA_END; +// ****************************************************************** +// * D3DDevice_MakeSpace +// ****************************************************************** +OOVPA_XREF(D3DDevice_MakeSpace, 4134, 8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x0A, XREF_D3D_MakeRequestedSpace ), + + { 0x00, 0xA1 }, + { 0x05, 0x50 }, + { 0x06, 0xD1 }, + { 0x07, 0xE8 }, + { 0x08, 0x50 }, + { 0x09, 0xE8 }, + { 0x0E, 0xC3 }, +OOVPA_END; + // ****************************************************************** // * Rollback support signature(s) // ****************************************************************** @@ -2723,7 +2742,7 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 2a1d0a706..e6e693bdd 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -1334,7 +1334,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index 59c6fe57c..c8f53eacf 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -682,7 +682,7 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index df17291e5..a79c316f5 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -101,6 +101,7 @@ OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest, 4627, 11) { 0x26, 0x0C }, OOVPA_END; +#if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3DDevice_EndVisibilityTest // ****************************************************************** @@ -128,6 +129,7 @@ OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 4627, 12) { 0x14, 0x07 }, { 0x15, 0x80 }, OOVPA_END; +#endif // ****************************************************************** // * D3D_GetAdapterDisplayMode @@ -3436,7 +3438,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4627, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle2, 4627, PATCH), @@ -3482,7 +3484,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 4627, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index f9ee986a8..11875f75f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -794,7 +794,10 @@ OOVPA_END; // ****************************************************************** // * D3DDevice_End // ****************************************************************** -OOVPA_NO_XREF(D3DDevice_End, 5028, 12) +OOVPA_NO_XREF(D3DDevice_End, 5028, 13) + + // D3DDevice_End+0x00 : push esi + { 0x00, 0x56 }, // D3DDevice_End+0x13 : mov dword ptr [eax], 0x417FC { 0x13, 0xC7 }, @@ -1143,7 +1146,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), @@ -1181,7 +1184,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index bc598c7eb..3f61a31ef 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -695,7 +695,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), - REGISTER_OOVPA(D3DDevice_End, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), @@ -793,7 +793,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index f9c8cb7e7..06559f61f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -672,6 +672,32 @@ OOVPA_NO_XREF(D3DDevice_SetVertexDataColor, 5344, 8) { 0x1C, 0x19 }, OOVPA_END; #endif + +// ****************************************************************** +// * D3DDevice_End +// ****************************************************************** +//Generic OOVPA as of 5344 and newer. +OOVPA_NO_XREF(D3DDevice_End, 5344, 14) + + { 0x08, 0x06 }, + { 0x0A, 0x46 }, + { 0x0E, 0xE8 }, + { 0x15, 0xFC }, + { 0x17, 0x04 }, + + { 0x34, 0x4E }, + { 0x35, 0x08 }, + { 0x36, 0x5E }, + { 0x37, 0x74 }, + { 0x38, 0x07 }, + { 0x39, 0x6A }, + { 0x3A, 0x01 }, + { 0x3B, 0xE8 }, + + { 0x40, 0xC3 }, +OOVPA_END; + +#if 0 // No longer used, replaced by generic 5344 version // ****************************************************************** // * D3DDevice_End // ****************************************************************** @@ -687,6 +713,7 @@ OOVPA_NO_XREF(D3DDevice_End, 5344, 9) { 0x1B, 0x04 }, { 0x40, 0xC3 }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_CreatePixelShader @@ -1274,7 +1301,7 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl index 1d1372c05..54e93cc24 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5455.inl @@ -577,3 +577,17 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 5455, 9) { 0xDE, 0x8B }, { 0xFE, 0x8B }, OOVPA_END; + +// ****************************************************************** +// * D3D_AllocContiguousMemory +// ****************************************************************** +OOVPA_NO_XREF(D3D_AllocContiguousMemory, 5455, 7) + + { 0x05, 0x10 }, + { 0x0C, 0x00 }, + { 0x13, 0x00 }, + { 0x1A, 0x08 }, + { 0x21, 0xBC }, + { 0x28, 0x0D }, + { 0x2F, 0x24 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index e1f1a512d..56fc9c25d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -1208,6 +1208,7 @@ OOVPA_XREF(D3D_MakeRequestedSpace, 5558, 26, // Also for 5659 { 0x1F, 0x00 }, OOVPA_END; +#if 0 // Moved to 4134 // ****************************************************************** // * D3DDevice_MakeSpace // ****************************************************************** @@ -1222,6 +1223,7 @@ OOVPA_NO_XREF(D3DDevice_MakeSpace, 5558, 7) { 0x09, 0xE8 }, { 0x0E, 0xC3 }, OOVPA_END; +#endif #if 0 // Moved to 5455 // ****************************************************************** // * D3DDevice_SetRenderTarget@8 @@ -1635,6 +1637,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5455, 9) { 0x26, 0x00 }, OOVPA_END; #endif +#if 0 // No longer used, replaced by generic 5344 version // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** @@ -1650,6 +1653,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5558, 9) { 0x24, 0xC2 }, { 0x26, 0x00 }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_SetRenderState_Dxt1NoiseEnable @@ -2093,7 +2097,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), @@ -2198,7 +2202,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5558, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_MakeSpace, 5558, DISABLED), + REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), @@ -2232,8 +2236,8 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), @@ -2254,7 +2258,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index fc35381b4..b198aab4e 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -230,6 +230,7 @@ OOVPA_NO_XREF(D3DDevice_BeginStateBig, 5788, 15) { 0x40, 0x5E }, OOVPA_END; #endif +#if 0 // No longer used, replaced by generic 4627 version // ****************************************************************** // * D3DVertexBuffer8_Lock // ****************************************************************** @@ -244,7 +245,8 @@ OOVPA_NO_XREF(D3DVertexBuffer_Lock, 5788, 8) { 0x13, 0x33 }, { 0x16, 0x08 }, OOVPA_END; - +#endif +#if 0 // No longer used, replaced by generic 4627 version // ****************************************************************** // * D3DVertexBuffer_Lock2 // ****************************************************************** @@ -258,7 +260,9 @@ OOVPA_NO_XREF(D3DVertexBuffer_Lock2, 5788, 7) { 0x3E, 0x8B }, { 0x44, 0x00 }, OOVPA_END; +#endif +#if 0 // Moved to 5455 // ****************************************************************** // * D3D_AllocContiguousMemory // ****************************************************************** @@ -272,6 +276,7 @@ OOVPA_NO_XREF(D3D_AllocContiguousMemory, 5788, 7) { 0x28, 0x0D }, { 0x2F, 0x24 }, OOVPA_END; +#endif // ****************************************************************** // * D3DTexture8_GetLevelDesc @@ -707,6 +712,7 @@ OOVPA_XREF(D3D_MakeRequestedSpace, 5788, 28, // Also for 5849, 5933 { 0x1F, 0x00 }, OOVPA_END; +#if 0 // No longer used, replaced by generic D3DDevice_MakeSpace 4134 version // ****************************************************************** // * D3D::Unknown (D3D::MakeSpace?) // ****************************************************************** @@ -725,7 +731,7 @@ OOVPA_XREF(D3D_Unknown, 5788, 6, { 0x08, 0x50 }, { 0x0E, 0xC3 }, OOVPA_END; - +#endif #if 0 // No longer used, replaced by generic 5659 version // ****************************************************************** // * D3DDevice_AddRef @@ -863,6 +869,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 5788, 9) { 0x26, 0x00 }, OOVPA_END; +#if 0 // No longer used, replaced by generic 5344 version // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleRenderTargetMode // ****************************************************************** @@ -878,7 +885,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5788, 9) { 0x24, 0xC2 }, { 0x26, 0x00 }, OOVPA_END; - +#endif #if 0 // No longer used, replaced by generic 4627 version // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleAntiAlias @@ -1061,7 +1068,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), @@ -1077,7 +1084,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5659, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), @@ -1132,8 +1139,8 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), @@ -1141,7 +1148,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH + REGISTER_OOVPA(D3D_AllocContiguousMemory, 5455, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH REGISTER_OOVPA(Get2DSurfaceDesc, 5788, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), @@ -1184,7 +1191,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), - REGISTER_OOVPA(D3D_Unknown, 5788, XREF), + REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), @@ -1205,7 +1212,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index ab435d292..a31acf91f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -178,7 +178,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), @@ -195,7 +195,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_End, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5659, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), @@ -245,8 +245,8 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), @@ -254,7 +254,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5849, XREF), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH + REGISTER_OOVPA(D3D_AllocContiguousMemory, 5455, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH REGISTER_OOVPA(Get2DSurfaceDesc, 5849, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), @@ -295,7 +295,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), - REGISTER_OOVPA(D3D_Unknown, 5788, XREF), + REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), @@ -316,7 +316,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5788, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl index 61ce255e4..e26122daa 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl @@ -159,7 +159,7 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer2, UNPATCHED, 4627, 5344, 5455), REGISTER_OOVPAS(D3DDevice_CreateVertexShader, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3911, 4627), - REGISTER_OOVPAS(D3DDevice_DeletePatch, UNPATCHED, 4034), // (TODO) (from 4034's comment) + REGISTER_OOVPAS(D3DDevice_DeletePatch, UNPATCHED, 3911/*, 4039*/), // (TODO) (from 4034's comment) REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3911, 5344), REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3911/*, 4361, 5788*/), REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3911, 5344), @@ -170,11 +170,11 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DDevice_DrawVertices, PATCH, 3911, 4034, 5028), REGISTER_OOVPAS(D3DDevice_DrawVerticesUP, PATCH, 3911, 4039, 4134, 4627, 5344, 5558, 5788), REGISTER_OOVPAS(D3DDevice_EnableOverlay, PATCH, 3911, 4134), - REGISTER_OOVPAS(D3DDevice_End, PATCH, 3911, 4039, 4627, 5028, 5344, 5558), + REGISTER_OOVPAS(D3DDevice_End, PATCH, 3911, 4039/*, 4627, 5028/*, 5344/*, 5558*/), REGISTER_OOVPAS(D3DDevice_EndPush, PATCH, 4134/*, 4627*/), // Was 4627 (from 5233's comment) REGISTER_OOVPAS(D3DDevice_EndPushBuffer, PATCH, 3911, 4134), // Not implemented yet. (from 5788's comment) REGISTER_OOVPAS(D3DDevice_EndStateBlock, PATCH, 3911, 4134), - REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3911, 4034, 4361, 4627, 5788), + REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3911/*, 4034, 4361, 4627, 5788*/), REGISTER_OOVPAS(D3DDevice_FlushVertexCache, PATCH, 3911, 4134), REGISTER_OOVPAS(D3DDevice_GetBackBuffer, PATCH, 3911, 4034, 4134, 4627, 5558), // Called D3DDevice_GetBackBuffer2 (from 4627's comment) NOTE: Use D3DDevice_GetBackBuffer2 for 4627 and above REGISTER_OOVPAS(D3DDevice_GetBackBuffer2, PATCH, 4627, 5028, 5344, 5455, 5558, 5788), // 5233 (from 5344's comment) @@ -223,7 +223,7 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DDevice_LightEnable, PATCH, 3911, 5028, 5344), // Was 5233 (from 5344's comment) REGISTER_OOVPAS(D3DDevice_LoadVertexShader, PATCH, 3911, 4034, 4627, 5028), REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, PATCH, 3911, 4134, 4627, 5558), - REGISTER_OOVPAS(D3DDevice_MakeSpace, UNPATCHED, 5558), + REGISTER_OOVPAS(D3DDevice_MakeSpace, UNPATCHED, 4134), REGISTER_OOVPAS(D3DDevice_PersistDisplay, PATCH, 3911, 4039, 4627, 4831, 5455, 5558), REGISTER_OOVPAS(D3DDevice_Present, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3911, 4134, 4361, 4627), @@ -260,7 +260,7 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleAntiAlias, PATCH, 3911, 4034, 4134, 4432, 4627), REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMask, PATCH, 3911, 4034, 4134, 4627), REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMode, PATCH, 3925, 4034, 4134, 4627, 5233, 5455, 5558, 5788), - REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, PATCH, 4034, 4134, 4627, 5233, 5344, 5455, 5558, 5788), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, PATCH, 4034, 4134, 4627, 5233, 5344/*, 5455, 5558, 5788*/), // Was 5233 (from 5344's comment) REGISTER_OOVPAS(D3DDevice_SetRenderState_NormalizeNormals, PATCH, 3911, 4034, 4134), REGISTER_OOVPAS(D3DDevice_SetRenderState_OcclusionCullEnable, PATCH, 3911, 4034), REGISTER_OOVPAS(D3DDevice_SetRenderState_PSTextureModes, PATCH, 3911, 4034), @@ -330,10 +330,10 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel2, PATCH, 4627), REGISTER_OOVPAS(D3DTexture_LockRect, PATCH, 3911), REGISTER_OOVPAS(D3DVertexBuffer_GetDesc, UNPATCHED, 3911), - REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3911, 4034, 4531, 4627, 5788), - REGISTER_OOVPAS(D3DVertexBuffer_Lock2, PATCH, 4627, 5788), + REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3911, 4034, 4531, 4627/*, 5788*/), + REGISTER_OOVPAS(D3DVertexBuffer_Lock2, PATCH, 4627/*, 5788*/), REGISTER_OOVPAS(D3DVolumeTexture_LockBox, PATCH, 3911), // Just calls Lock3DSurface (from 4134, 4432's comment) - REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3911, 5788), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment) + REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3911, 5455/*, 5788*/), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment) REGISTER_OOVPAS(D3D_BlockOnResource, PATCH, 3911, 4034), REGISTER_OOVPAS(D3D_BlockOnTime, PATCH, 3911, 4039, 4361, 4627, 5028, 5558, 5849), REGISTER_OOVPAS(D3D_CMiniport_GetDisplayCapabilities, PATCH, 3911), @@ -355,7 +355,7 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3D_SetCommonDebugRegisters, PATCH, 3911), REGISTER_OOVPAS(D3D_SetFence, XREF, 3911, 4039, 4134, 5028, 5558), REGISTER_OOVPAS(D3D_SetPushBufferSize, UNPATCHED, 3911), - REGISTER_OOVPAS(D3D_Unknown, XREF, 5788), + // REGISTER_OOVPAS(D3D_Unknown, XREF, 5788), // This one D3DDevice_MakeSpace REGISTER_OOVPAS(Direct3D_CheckDeviceMultiSampleType, UNPATCHED, 3911), REGISTER_OOVPAS(Direct3D_CreateDevice, PATCH, 3911, 5028), REGISTER_OOVPAS(Get2DSurfaceDesc, PATCH, 3911, 4034, 4134, 4627, 5028, 5344, 5558, 5788, 5849), // Was 5233 (from 5344's comment)