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

Moved OOVPAs lowered

This commit is contained in:
jarupxx 2017-09-25 22:06:02 +09:00 committed by Luke Usher
parent 6032da1e76
commit 3bade6f050
13 changed files with 112 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2328,6 +2328,30 @@ OOVPA_NO_XREF(D3DDevice_GetViewport, 3925, 10)
{ 0x1B, 0x04 },
OOVPA_END;
// ******************************************************************
// * D3DDevice_GetGammaRamp
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_GetGammaRamp, 3911, 13) // Up to 5849
{ 0x05, 0x8B },
{ 0x0A, 0x00 },
{ 0x0B, 0x56 },
{ 0x0C, 0x8D },
{ 0x0D, 0x0C },
{ 0x0E, 0x49 },
{ 0x0F, 0xC1 },
{ 0x10, 0xE1 },
{ 0x11, 0x08 },
{ 0x16, 0x0C },
{ 0x1C, 0x00 },
{ 0x22, 0x00 },
{ 0x27, 0xC2 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 3911 version
// ******************************************************************
// * D3DDevice_GetGammaRamp
// ******************************************************************
@ -2341,6 +2365,7 @@ OOVPA_NO_XREF(D3DDevice_GetGammaRamp, 3925, 7)
{ 0x22, 0x00 },
{ 0x28, 0x04 },
OOVPA_END;
#endif
// ******************************************************************
// * D3DDevice_GetDisplayFieldStatus
// ******************************************************************
@ -4651,7 +4676,7 @@ OOVPATable D3D8_3925[] = {
REGISTER_OOVPA(D3DDevice_SetMaterial, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 3925, PATCH),

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

@ -103,6 +103,7 @@ OOVPA_NO_XREF(CMiniport_CreateCtxDmaObject, 4034, 32) // Also for 4361, 4627, 53
{ 0x1F, 0x3A },
OOVPA_END;
#if 0 // No longer used, replaced by generic 3911 version
// ******************************************************************
// * D3DDevice_GetGammaRamp
// ******************************************************************
@ -115,7 +116,7 @@ OOVPA_NO_XREF(D3DDevice_GetGammaRamp, 4034, 7)
{ 0x22, 0x00 },
{ 0x28, 0x04 },
OOVPA_END;
#endif
#if 0 // Moved to 3911
// ******************************************************************
// * D3DDevice_GetCreationParameters
@ -2362,7 +2363,7 @@ OOVPATable D3D8_4034[] = {
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH),

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

@ -2822,7 +2822,7 @@ OOVPATable D3D8_4134[] = {
REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),

14
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl
View File

@ -167,7 +167,7 @@ OOVPA_END;
// ******************************************************************
// * D3DDevice_SetVerticalBlankCallback
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback, 4361, 12)
OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback, 4242, 12)
// D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -193,7 +193,7 @@ OOVPA_END;
// ******************************************************************
// * D3DDevice_SetSwapCallback
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_SetSwapCallback, 4361, 12)
OOVPA_NO_XREF(D3DDevice_SetSwapCallback, 4242, 12)
// D3DDevice_SetSwapCallback+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -359,7 +359,7 @@ OOVPA_NO_XREF(D3DDevice_CaptureStateBlock, 4361, 9)
{ 0xAC, 0x00 },
OOVPA_END;
#endif
#if 1 //same as 3925
#if 0 //same as 3925
// ******************************************************************
// * D3DDevice_DeleteStateBlock
// ******************************************************************
@ -1219,7 +1219,7 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF),
REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH),
@ -1323,11 +1323,11 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4242, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH),
@ -1340,7 +1340,7 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH),
REGISTER_OOVPA(D3DDevice_End, 4039, PATCH),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4242, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH),

4
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl
View File

@ -744,7 +744,7 @@ OOVPATable D3D8_4432[] {
REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH),
REGISTER_OOVPA(D3D_SetFence, 4134, XREF),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4432, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
@ -818,7 +818,7 @@ OOVPATable D3D8_4432[] {
REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH),

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

@ -3385,7 +3385,7 @@ OOVPATable D3D8_4627[] = {
REGISTER_OOVPA(D3DDevice_BeginPush, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4627, DISABLED), // Called D3DDevice_GetBackBuffer2
REGISTER_OOVPA(D3DDevice_SetViewport, 4627, PATCH),

29
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
View File

@ -664,6 +664,30 @@ OOVPA_NO_XREF(D3DDevice_GetPixelShader, 5028, 7)
{ 0x13, 0x00 },
OOVPA_END;
// ******************************************************************
// * D3D::CommonSetRenderTarget
// ******************************************************************
OOVPA_XREF(D3D_CommonSetRenderTarget, 5028, 12,
XREF_COMMONSETRENDERTARGET,
XRefZero)
{ 0x02, 0x1C },
{ 0x1A, 0x15 },
{ 0x3D, 0x28 },
{ 0x3E, 0x05 },
{ 0x3F, 0x00 },
{ 0x40, 0x00 },
{ 0x41, 0x89 },
{ 0x42, 0x4C },
{ 0x43, 0x24 },
{ 0x44, 0x24 },
{ 0x7E, 0xD8 },
{ 0x7F, 0x05 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 5028 version
// ******************************************************************
// * D3D_CommonSetRenderTarget
// ******************************************************************
@ -683,7 +707,7 @@ OOVPA_XREF(D3D_CommonSetRenderTarget, 5028, 10,
{ 0x57, 0x10 },
{ 0x67, 0x00 },
OOVPA_END;
#endif
#if 0 // No longer used, replaced by generic 4831 version
// ******************************************************************
// * D3DDevice_PersistDisplay
@ -1099,7 +1123,6 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 5120, 13)
{ 0x95, 0x8B },
OOVPA_END;
// ******************************************************************
// * Rollback support signature(s)
// ******************************************************************
@ -1126,7 +1149,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetViewport, 5028, PATCH),
REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF),

8
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl
View File

@ -405,7 +405,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, 8,
{ 0x2C, 0xE8 },
{ 0x32, 0x04 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 5028 version
// ******************************************************************
// * D3D::CommonSetRenderTarget
// ******************************************************************
@ -423,7 +423,7 @@ OOVPA_XREF(D3D_CommonSetRenderTarget, 5233, 8,
{ 0xDC, 0xD9 },
{ 0xFF, 0x75 },
OOVPA_END;
#endif
#if 0 // No longer used, replaced by generic 3925 version
// ******************************************************************
// * D3DDevice_BlockOnFence
@ -662,13 +662,13 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH),
REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5233, XREF),
REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF),
REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_AddRef, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH),

4
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl
View File

@ -1139,7 +1139,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH),
@ -1337,7 +1337,7 @@ OOVPATable D3D8_5344[] = {
// Unused functions in XDK 5344
// TODO: Remove
// ******************************************************************
REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5233, XREF), // Used between 4627 to 5233
REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), // Used between 4627 to 5233
// ******************************************************************
};

30
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl
View File

@ -206,6 +206,30 @@ OOVPA_NO_XREF(D3DDevice_SetViewport, 5455, 8)
{ 0xFE, 0x85 },
OOVPA_END;
// ******************************************************************
// * D3DDevice_CreateVertexBuffer2
// ******************************************************************
OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2, 5455, 14)
{ 0x00, 0x56 },
{ 0x08, 0xE8 },
{ 0x16, 0x08 },
{ 0x17, 0x68 },
{ 0x18, 0x00 },
{ 0x19, 0x00 },
{ 0x1A, 0x80 },
{ 0x1B, 0xB2 },
{ 0x1C, 0x50 },
{ 0x1D, 0xE8 },
{ 0x26, 0x68 },
{ 0x31, 0x33 },
{ 0x3A, 0xFF },
{ 0x44, 0x01 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 5455 version
// ******************************************************************
// * D3DDevice_CreateVertexBuffer2
// ******************************************************************
@ -219,7 +243,7 @@ OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer2, 5558, 7)
{ 0x3A, 0xFF },
{ 0x44, 0x01 },
OOVPA_END;
#endif
#if 0 // No longer used, replaced by generic 5233 version
// ******************************************************************
// * D3DDevice_UpdateOverlay
@ -2018,7 +2042,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5558, DISABLED),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED),
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH),
@ -2110,7 +2134,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH),
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),

10
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
View File

@ -937,7 +937,7 @@ OOVPA_NO_XREF(D3DDevice_GetBackMaterial, 5788, 8)
{ 0x16, 0xF3 },
{ 0x1A, 0xC2 },
OOVPA_END;
#if 0 // No longer used, replaced by generic 3925 version
// ******************************************************************
// * D3DDevice_DeleteStateBlock
// ******************************************************************
@ -958,7 +958,7 @@ OOVPA_NO_XREF(D3DDevice_DeleteStateBlock, 5788, 9)
{ 0x3D, 0x6F },
{ 0x3E, 0x08 },
OOVPA_END;
#endif
#if 0 // Used 3925 instead in 5788, 5849
// ******************************************************************
// * D3DDevice_SetRenderState_RopZCmpAlwaysRead
@ -1131,7 +1131,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5558, DISABLED),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH),
@ -1163,7 +1163,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5659, PATCH),
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
@ -1217,7 +1217,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH),

6
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl
View File

@ -236,7 +236,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5558, DISABLED),
REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH),
@ -267,7 +267,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH),
REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5659, PATCH),
REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 5849, PATCH),
@ -318,7 +318,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 5788, PATCH),
REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH),

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

@ -90,7 +90,6 @@
// * D3DTexture_GetSurfaceLevel (4928, 5455)
// * D3DVertexBuffer_Lock (4721, 4831, 4928, 5120, 5233, 5455)
// * D3D_ClearStateBlockFlags (4039, 4721, 5028, 5120)
// * D3D_CommonSetRenderTarget (5120)
// * D3D_RecordStateBlock (4039, 4721, 5028, 5120)
#ifndef D3D8_OOVPA_INL
@ -153,7 +152,7 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3925, 4627),
REGISTER_OOVPAS(D3DDevice_DeletePatch, UNPATCHED, 4034), // (TODO) (from 4034's comment)
REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3925, 5344),
REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3925, 4361, 5788),
REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3925/*, 4361, 5788*/),
REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3925, 5344),
REGISTER_OOVPAS(D3DDevice_DrawIndexedVertices, PATCH, 3925, 4034, 4627, 5028),
REGISTER_OOVPAS(D3DDevice_DrawIndexedVerticesUP, PATCH, 3925, 4039, 4134, 4627, 5028, 5344, 5558, 5788),
@ -177,7 +176,7 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3DDevice_GetDeviceCaps, UNPATCHED, 3925),
REGISTER_OOVPAS(D3DDevice_GetDisplayFieldStatus, PATCH, 3925, 4039, 4432, 5233, 5788),
REGISTER_OOVPAS(D3DDevice_GetDisplayMode, PATCH, 3925, 4039, 4432, 4627),
REGISTER_OOVPAS(D3DDevice_GetGammaRamp, PATCH, 3925, 4034),
REGISTER_OOVPAS(D3DDevice_GetGammaRamp, PATCH, 3911/*, 3925, 4034*/),
REGISTER_OOVPAS(D3DDevice_GetLight, PATCH, 3925),
REGISTER_OOVPAS(D3DDevice_GetLightEnable, PATCH, 3911, 5344),
REGISTER_OOVPAS(D3DDevice_GetMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788),
@ -280,7 +279,7 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3DDevice_SetStateVB, UNPATCHED, 3911, 4627),
REGISTER_OOVPAS(D3DDevice_SetStipple, PATCH, 4627),
REGISTER_OOVPAS(D3DDevice_SetStreamSource, PATCH, 3925, 4034),
REGISTER_OOVPAS(D3DDevice_SetSwapCallback, PATCH, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659),
REGISTER_OOVPAS(D3DDevice_SetSwapCallback, PATCH, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659),
REGISTER_OOVPAS(D3DDevice_SetTexture, PATCH, 3925, 4034, 4627, 4831, 5344), // Was 4928 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_SetTextureState_BorderColor, PATCH, 3925, 4034, 4361),
REGISTER_OOVPAS(D3DDevice_SetTextureState_BumpEnv, PATCH, 3925, 4039),
@ -303,7 +302,7 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstantNotInlineFast, PATCH, 4627),
REGISTER_OOVPAS(D3DDevice_SetVertexShaderInput, PATCH, 3925, 4134, 4361),
REGISTER_OOVPAS(D3DDevice_SetVertexShaderInputDirect, PATCH, 4361),
REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3925, 4039, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3925, 4039, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_SetViewport, PATCH, 3925, 4034, 4627, 5028, 5344, 5455), // Was 5233 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_Swap, PATCH, 4034, 4531, 4627, 5028, 5233),
REGISTER_OOVPAS(D3DDevice_SwitchTexture, PATCH, 3925, 4361),
@ -331,7 +330,7 @@ OOVPATable D3D8_OOVPAV2[] = {
REGISTER_OOVPAS(D3D_CMiniport_GetDisplayCapabilities, PATCH, 3911),
REGISTER_OOVPAS(D3D_CheckDeviceFormat, UNPATCHED, 3911, 4134),
REGISTER_OOVPAS(D3D_ClearStateBlockFlags, XREF, 3911, 5788),
REGISTER_OOVPAS(D3D_CommonSetRenderTarget, XREF, 4627, 5028, 5233), // Used between 4627 to 5233 (from 5344's comment)
REGISTER_OOVPAS(D3D_CommonSetRenderTarget, XREF, 4627, 5028/*, 5233*/), // Used between 4627 to 5233 (from 5344's comment)
REGISTER_OOVPAS(D3D_CommonSetRenderTargetB, XREF, 4627),
REGISTER_OOVPAS(D3D_CreateDeviceX, UNPATCHED, 4627),
REGISTER_OOVPAS(D3D_CreateStandAloneSurface, XREF, 4134),