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

Reregisterd Obsolete OOVPA UNPATCHED

This commit is contained in:
jarupxx 2017-10-16 19:44:42 +09:00 committed by Luke Usher
parent cee6e19019
commit 1e6d43e38e
5 changed files with 121 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
View File

@ -4386,3 +4386,88 @@ OOVPA_NO_XREF(D3DDevice_GetPushBufferOffset, 3911, 7)
{ 0x82, 0x04 }, { 0x82, 0x04 },
{ 0x98, 0x89 }, { 0x98, 0x89 },
OOVPA_END; OOVPA_END;
// ******************************************************************
// * D3D_GetAdapterDisplayMode
// ******************************************************************
OOVPA_NO_XREF(D3D_GetAdapterDisplayMode, 3911, 21)
{ 0x00, 0x8B },
{ 0x01, 0x44 },
{ 0x02, 0x24 },
{ 0x03, 0x04 },
{ 0x04, 0x85 },
{ 0x05, 0xC0 },
{ 0x06, 0x74 },
{ 0x07, 0x08 },
{ 0x08, 0xB8 },
{ 0x09, 0x6C },
{ 0x0A, 0x08 },
{ 0x0B, 0x76 },
{ 0x0C, 0x88 },
{ 0x0D, 0xC2 },
{ 0x0E, 0x08 },
{ 0x0F, 0x00 },
{ 0x10, 0x8B },
//{ 0x11, 0x0D }, // 0D vs 15
{ 0x1E, 0x33 },
{ 0x1F, 0xC0 },
{ 0x30, 0x00 },
{ 0x31, 0x8B },
OOVPA_END;
// ******************************************************************
// * D3D_EnumAdapterModes
// ******************************************************************
// Generic OOVPA as of 3911 and newer.
OOVPA_NO_XREF(D3D_EnumAdapterModes, 3911, 14)
{ 0x00, 0x83 },
{ 0x01, 0xEC },
{ 0x12, 0x57 },
{ 0x13, 0x89 },
{ 0x14, 0x44 },
{ 0x15, 0x24 },
{ 0x16, 0x14 },
{ 0x17, 0x89 },
{ 0x18, 0x4C },
{ 0x19, 0x24 },
{ 0x1A, 0x20 },
{ 0x1B, 0xE8 },
{ 0x50, 0x6C },
{ 0x51, 0x24 },
OOVPA_END;
// ******************************************************************
// * D3D_GetAdapterModeCount
// ******************************************************************
// Generic OOVPA as of 3911 and newer.
OOVPA_NO_XREF(D3D_GetAdapterModeCount, 3911, 20)
{ 0x00, 0x83 },
{ 0x01, 0xEC },
{ 0x02, 0x08 },
{ 0x03, 0x53 },
{ 0x04, 0x55 },
{ 0x05, 0x56 },
{ 0x06, 0x57 },
{ 0x07, 0xC7 },
{ 0x08, 0x44 },
{ 0x09, 0x24 },
{ 0x0A, 0x10 },
{ 0x0B, 0x00 },
{ 0x0C, 0x00 },
{ 0x0D, 0x00 },
{ 0x0E, 0x00 },
{ 0x0F, 0xE8 },
{ 0x1D, 0x8B },
{ 0x1E, 0xD1 },
{ 0x40, 0x14 },
{ 0x41, 0xEB },
OOVPA_END;

7
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl
View File

@ -3774,7 +3774,7 @@ OOVPA_XREF(D3DDevice_BlockOnFence, 3925, 8,
{ 0x0E, 0x00 }, { 0x0E, 0x00 },
OOVPA_END; OOVPA_END;
#endif #endif
#if 0 // No longer used, replaced by generic 3911 version
// ****************************************************************** // ******************************************************************
// * D3D_EnumAdapterModes // * D3D_EnumAdapterModes
// ****************************************************************** // ******************************************************************
@ -3789,7 +3789,8 @@ OOVPA_NO_XREF(D3D_EnumAdapterModes, 3925, 8)
{ 0xE2, 0x89 }, { 0xE2, 0x89 },
{ 0xFE, 0x5D }, { 0xFE, 0x5D },
OOVPA_END; OOVPA_END;
#endif
#if 0 // No longer used, replaced by generic 3911 version
// ****************************************************************** // ******************************************************************
// * D3D_GetAdapterModeCount // * D3D_GetAdapterModeCount
// ****************************************************************** // ******************************************************************
@ -3804,7 +3805,7 @@ OOVPA_NO_XREF(D3D_GetAdapterModeCount, 3925, 8)
{ 0x8A, 0x3B }, { 0x8A, 0x3B },
{ 0x9E, 0x00 }, { 0x9E, 0x00 },
OOVPA_END; OOVPA_END;
#endif
#if 0 // Moved to 3911 #if 0 // Moved to 3911
// ****************************************************************** // ******************************************************************
// * D3DDevice_Reset // * D3DDevice_Reset

5
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
View File

@ -112,6 +112,7 @@ OOVPA_NO_XREF(D3D_CheckDeviceFormat, 4134, 8)
{ 0x62, 0x18 }, { 0x62, 0x18 },
OOVPA_END; OOVPA_END;
#if 0 // No longer used, replaced by generic 3911 version
// ****************************************************************** // ******************************************************************
// * D3D_GetAdapterModeCount // * D3D_GetAdapterModeCount
// ****************************************************************** // ******************************************************************
@ -137,7 +138,8 @@ OOVPA_NO_XREF(D3D_GetAdapterModeCount, 4134, 12)
{ 0x9A, 0xC4 }, { 0x9A, 0xC4 },
{ 0x9B, 0x08 }, { 0x9B, 0x08 },
OOVPA_END; OOVPA_END;
#endif
#if 0 // No longer used, replaced by generic 3911 version
// ****************************************************************** // ******************************************************************
// * D3D_EnumAdapterModes // * D3D_EnumAdapterModes
// ****************************************************************** // ******************************************************************
@ -159,6 +161,7 @@ OOVPA_NO_XREF(D3D_EnumAdapterModes, 4134, 10)
{ 0xF7, 0x10 }, { 0xF7, 0x10 },
{ 0xF8, 0x1E }, { 0xF8, 0x1E },
OOVPA_END; OOVPA_END;
#endif
// ****************************************************************** // ******************************************************************
// * D3DDevice_SetRenderState_FogColor // * D3DDevice_SetRenderState_FogColor

25
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl
View File

@ -129,6 +129,30 @@ OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 4627, 12)
{ 0x15, 0x80 }, { 0x15, 0x80 },
OOVPA_END; OOVPA_END;
// ******************************************************************
// * D3D_GetAdapterDisplayMode
// ******************************************************************
// Generic OOVPA as of 4627 and newer.
OOVPA_NO_XREF(D3D_GetAdapterDisplayMode, 4627, 13)
{ 0x00, 0x8B },
{ 0x01, 0x44 },
{ 0x0A, 0x08 },
{ 0x0B, 0x76 },
{ 0x0C, 0x88 },
{ 0x0D, 0xC2 },
{ 0x0E, 0x08 },
{ 0x0F, 0x00 },
{ 0x10, 0x56 },
{ 0x11, 0x8B },
{ 0x12, 0x35 },
{ 0x30, 0xC2 },
{ 0x31, 0x08 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 4627 version
// ****************************************************************** // ******************************************************************
// * D3D_GetAdapterDisplayMode // * D3D_GetAdapterDisplayMode
// ****************************************************************** // ******************************************************************
@ -155,6 +179,7 @@ OOVPA_NO_XREF(D3D_GetAdapterDisplayMode, 4627, 13)
{ 0xB6, 0xC2 }, { 0xB6, 0xC2 },
{ 0xB7, 0x08 }, { 0xB7, 0x08 },
OOVPA_END; OOVPA_END;
#endif
// ****************************************************************** // ******************************************************************
// * D3D_KickOffAndWaitForIdle // * D3D_KickOffAndWaitForIdle

3
src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl
View File

@ -343,7 +343,10 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3D_CommonSetRenderTargetB, XREF, 4627), REGISTER_OOVPAS(D3D_CommonSetRenderTargetB, XREF, 4627),
REGISTER_OOVPAS(D3D_CreateDeviceX, UNPATCHED, 4627), REGISTER_OOVPAS(D3D_CreateDeviceX, UNPATCHED, 4627),
REGISTER_OOVPAS(D3D_CreateStandAloneSurface, XREF, 4134), REGISTER_OOVPAS(D3D_CreateStandAloneSurface, XREF, 4134),
REGISTER_OOVPAS(D3D_EnumAdapterModes, UNPATCHED, 3911),
REGISTER_OOVPAS(D3D_GetAdapterDisplayMode, UNPATCHED, 3911, 4627),
REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3911), REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3911),
REGISTER_OOVPAS(D3D_GetAdapterModeCount, UNPATCHED, 3911),
REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3911), REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3911),
REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3911, 4034, 4627, 5028), REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3911, 4034, 4627, 5028),
REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle2, PATCH, 4627), REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle2, PATCH, 4627),