diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 324a2098d..3c3b6d48b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -2557,7 +2557,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), @@ -2567,11 +2567,11 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_KickOff, 4039, PATCH), REGISTER_OOVPA(D3D_SetFence, 4039, XREF), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 4039, XREF), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4039, PATCH), @@ -2593,7 +2593,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), @@ -2623,7 +2623,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), @@ -2639,7 +2639,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), @@ -2663,7 +2663,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), @@ -2678,7 +2678,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), @@ -2708,14 +2708,14 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4134, PATCH), +// REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), +// REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), +// REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), +// REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), +// REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), // REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), @@ -2727,7 +2727,7 @@ OOVPATable D3D8_4034[] = { // REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), -// REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH), +// REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), // ****************************************************************** }; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 7e1df3720..883ab1052 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -2831,14 +2831,14 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), @@ -2849,7 +2849,7 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), @@ -2882,61 +2882,61 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), REGISTER_OOVPA(D3D_CreateStandAloneSurface, 4134, XREF), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), @@ -2944,17 +2944,17 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 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), - REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4134, PATCH), @@ -2969,12 +2969,12 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), @@ -2989,21 +2989,21 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH), + REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), @@ -3012,7 +3012,7 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 080d9483b..2497ddc88 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -1228,12 +1228,12 @@ OOVPA_END; // ****************************************************************** OOVPATable D3D8_4361[] = { - REGISTER_OOVPA(CMiniport_InitHardware, 4361, PATCH), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), @@ -1245,55 +1245,55 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), @@ -1301,16 +1301,16 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Release, 4361, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), // TODO: This needs to be verified on 4361, not just 4242! @@ -1320,28 +1320,28 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), // Just calls Lock2DSurface - REGISTER_OOVPA(D3DDevice_SetPalette, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), @@ -1349,18 +1349,18 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, 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_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), @@ -1374,32 +1374,32 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), + REGISTER_OOVPA(D3D_BlockOnTime, 4039, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), @@ -1408,10 +1408,10 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 4039, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), @@ -1419,7 +1419,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), }; // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index 38144f8b8..dbe440501 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -705,68 +705,68 @@ OOVPA_END; // No longer supported XDK 4531 by HLEDB_v1 OOVPATable D3D8_4432[] { - REGISTER_OOVPA(CMiniport_InitHardware, 4361, PATCH), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 4242, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShader, 4039, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4242, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 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), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), // REGISTER_OOVPA(D3DDevice_Swap, 4531, PATCH), @@ -774,19 +774,19 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4432, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 4432, PATCH), + REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), @@ -798,96 +798,96 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), // REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), // REGISTER_OOVPA(D3DVertexBuffer_Lock, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPush, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_BeginPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface REGISTER_OOVPA(D3DDevice_PersistDisplay, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH),// Just calls Lock2DSurface - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH), + REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 4039, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH), + REGISTER_OOVPA(D3D_BlockOnTime, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetTile, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_CopyRects, 4034, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index dc7497590..bcf80fa01 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -1080,7 +1080,7 @@ OOVPA_NO_XREF(D3DDevice_CreateTexture, 4627, 11) { 0x38, 0xC2 }, OOVPA_END; -#if 0 // Used 4134 instead in 4627, 4721, 4831, 4928 +#if 0 // Used 4034 instead in 4627, 4721, 4831, 4928 // ****************************************************************** // * D3DDevice_SetIndices // ****************************************************************** @@ -3641,7 +3641,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), REGISTER_OOVPA(D3D_CreateDeviceX, 4627, DISABLED), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), @@ -3655,22 +3655,22 @@ OOVPATable D3D8_4627[] = { 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), + REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3D_CommonSetRenderTarget, 4627, XREF), REGISTER_OOVPA(D3D_CommonSetRenderTargetB, 4627, XREF), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4627, DISABLED), // Called D3DDevice_GetRenderTarget2 REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 4627, DISABLED), // Called D3DDevice_GetDepthStencilSurface2 - REGISTER_OOVPA(D3DDevice_GetTile, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), @@ -3683,16 +3683,16 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, PATCH), // REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture, 4627, DISABLED), // Called D3DDevice_CreateTexture2 - REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), + REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), // REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4627, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), @@ -3700,41 +3700,41 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), @@ -3746,7 +3746,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED), - REGISTER_OOVPA(Get2DSurfaceDesc, 4627, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), @@ -3761,37 +3761,37 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 4531, PATCH), // REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), // Beware of the typo... + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStateVB, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), @@ -3803,7 +3803,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_PersistDisplay, 4627, PATCH), // REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), @@ -3812,7 +3812,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), @@ -3832,22 +3832,22 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DPalette_Lock, 4627, PATCH), // Called D3DPalette_Lock2 REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_GetPersistedSurface2, 4928, PATCH), // For only on Unreal Championship REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(CMiniport_IsFlipPending, 4627, XREF), - REGISTER_OOVPA(CMiniport_InitHardware, 4627, PATCH), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), @@ -3857,11 +3857,11 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index 8131becc3..55e88144b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -1242,13 +1242,13 @@ OOVPA_END; // No longer supported XDK 5120 by HLEDB_v1 OOVPATable D3D8_5028[] = { - REGISTER_OOVPA(CMiniport_InitHardware, 4627, XREF), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, XREF), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, XREF), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, XREF), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), @@ -1259,20 +1259,20 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), @@ -1282,66 +1282,66 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 5028, DISABLED), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 4531, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), REGISTER_OOVPA(D3DResource_GetType, 4034, DISABLED), // I forget why I had this in here... - REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), @@ -1355,35 +1355,35 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3D_SetFence, 5028, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), // Beware of the typo... + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStateVB, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), @@ -1394,7 +1394,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), @@ -1412,7 +1412,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), @@ -1422,12 +1422,12 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), @@ -1448,11 +1448,11 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index 617dba980..94de6ed94 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -661,27 +661,27 @@ OOVPA_END; // ****************************************************************** OOVPATable D3D8_5233[] = { - REGISTER_OOVPA(CMiniport_InitHardware, 4627, PATCH), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5233, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3D_CommonSetRenderTarget, 5028, XREF), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4627, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), @@ -696,36 +696,36 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 5028, DISABLED), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), @@ -733,16 +733,16 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LightEnable, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), @@ -751,12 +751,12 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetViewport, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), @@ -764,32 +764,32 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3D_SetFence, 5028, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, PATCH), // Beware of the typo... - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4034, PATCH), // Beware of the typo... + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), // Was 4627 @@ -806,7 +806,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), @@ -814,51 +814,51 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), // ****************************************************************** // Provisional registration functions in XDK 5233 diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index de1a3a246..c0f35b8fa 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -1345,26 +1345,26 @@ OOVPA_END; // ****************************************************************** OOVPATable D3D8_5344[] = { - REGISTER_OOVPA(CMiniport_InitHardware, 4627, PATCH), + REGISTER_OOVPA(CMiniport_InitHardware, 4034, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5028, PATCH), - REGISTER_OOVPA(D3D_CheckDeviceFormat, 4134, DISABLED), + REGISTER_OOVPA(D3D_CheckDeviceFormat, 3911, DISABLED), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233 REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5344, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), @@ -1381,36 +1381,36 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), // Was 4627 - REGISTER_OOVPA(D3DDevice_SetIndices, 5028, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 5344, PATCH), // Was 4928 - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), // Was 4627 + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), + REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), // Was 4928 + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), // Was 4627 REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DDevice_End, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5344, DISABLED), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5344, PATCH), // Was 5233 + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), // Was 5233 REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), @@ -1420,9 +1420,9 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134 REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), @@ -1434,11 +1434,11 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH), // 5233 + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), // 5233 REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH), // Was 4627 + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), // Was 4627 REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH), // Was 5233 REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), @@ -1446,33 +1446,33 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233 + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), // Was 5233 REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH), // Was 5233 + REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), // Was 5233 REGISTER_OOVPA(D3D_SetFence, 5028, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), // 4134 - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), @@ -1483,52 +1483,52 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 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), + REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette2, 5344, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 5233, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 5344, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DPalette_Lock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), @@ -1540,13 +1540,13 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index 83e2825e0..43bf4df25 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -2183,7 +2183,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), @@ -2194,55 +2194,55 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), 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, 5455, DISABLED), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5558, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, 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), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 5558, PATCH), // REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 5558, PATCH), // REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 5558, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), + REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), @@ -2250,9 +2250,9 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), @@ -2262,11 +2262,11 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), @@ -2277,11 +2277,11 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5558, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), @@ -2291,34 +2291,34 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5344, PATCH), // For 5455 REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5558, PATCH), // REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5558, PATCH), // REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 4034, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, PATCH), REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5455, PATCH), @@ -2327,57 +2327,57 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4627, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5455, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 5558, PATCH), + REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), 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_MultiSampleMode, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, 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_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), // for 5455 REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 5028, 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), REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), @@ -2385,21 +2385,21 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index 3ac2133d0..471996026 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -1143,44 +1143,44 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, 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), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 5558, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), + REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), // Not implemented yet. + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // Not implemented yet. REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), @@ -1188,9 +1188,9 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), + REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), @@ -1205,7 +1205,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), @@ -1217,50 +1217,50 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, 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(Get2DSurfaceDesc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), 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_DrawVerticesUP, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, 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), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), + REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, XREF), REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), @@ -1268,42 +1268,42 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5659, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 5788, XREF), + REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3D_RecordStateBlock, 5788, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, 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), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), @@ -1312,12 +1312,12 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), @@ -1326,9 +1326,9 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index af670ea87..ddec94b8b 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -186,53 +186,53 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_GetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_Swap, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4039, 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), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 5849, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 5558, DISABLED), - REGISTER_OOVPA(D3DDevice_SetTexture, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), + REGISTER_OOVPA(D3DDevice_SetTexture, 4831, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), // Not implemented yet. - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), // Not implemented yet. + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), // Not implemented yet. REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5558, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBig, 5028, XREF), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 5558, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5344, PATCH), + REGISTER_OOVPA(D3DDevice_SetMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), @@ -246,58 +246,58 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), 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(D3DDevice_DrawVertices, 3911, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 5849, XREF), + REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), + REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, 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(Get2DSurfaceDesc, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5659, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5659, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 5849, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 4034, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 4627, PATCH), - REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), + REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, XREF), REGISTER_OOVPA(D3DDevice_MakeSpace, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), @@ -305,49 +305,49 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 5659, PATCH), - REGISTER_OOVPA(D3D_ClearStateBlockFlags, 5788, XREF), + REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3D_RecordStateBlock, 5788, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 5558, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetScissors, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetTexture2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 5849, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderTargetFast, 5233, PATCH), + REGISTER_OOVPA(D3DDevice_SetDepthClipPlanes, 4432, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), REGISTER_OOVPA(D3DDevice_CreatePalette2, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), + REGISTER_OOVPA(D3DDevice_GetMaterial, 5659, PATCH), REGISTER_OOVPA(D3DDevice_GetStreamSource2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF), @@ -356,17 +356,17 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH),