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

Removed duplicate, DISABLED OOVPA registrations

This commit is contained in:
PatrickvL 2017-04-10 09:09:26 +02:00
parent 05d886e0b4
commit e162730b79
2 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1106,8 +1106,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_BeginPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 5233, PATCH),

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

@ -828,8 +828,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3D_CheckDeviceFormat, 4361, DISABLED),
REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_GetGammaRamp, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4928, PATCH),
REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
@ -853,15 +852,12 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetPixelShader, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_CreateTexture2, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetIndices, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTexture, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetTexture, 5233, PATCH), // Was 4928
REGISTER_OOVPA(D3DDevice_SetTexture, 5233, ALIAS, D3DDevice_SetTextureB),
REGISTER_OOVPA(D3DDevice_SetTexture, 4928, DISABLED),
REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData2f, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_Begin, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_End, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_Clear, 5233, PATCH),
@ -881,8 +877,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 4361, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4361, PATCH),
@ -895,42 +890,34 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, 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_SetTransform, 4134, DISABLED),
REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134
REGISTER_OOVPA(D3DDevice_SetStreamSource, 4361, PATCH),
REGISTER_OOVPA(D3D_GetDeviceCaps, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, PATCH), // 5233
REGISTER_OOVPA(D3DDevice_UpdateOverlay, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetViewport, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetViewport, 5344, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetViewport, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3DPalette_Lock2, 5233, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5233, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5233, DISABLED),
REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DSurface_GetDesc, 4361, PATCH),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
@ -942,8 +929,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_Release, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3D_SetFence, 5233, XREF),
REGISTER_OOVPA(D3DDevice_InsertFence, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_IsFencePending, 5233, PATCH),
@ -952,21 +938,16 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH),
REGISTER_OOVPA(D3DDevice_SetPalette, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_GetCreationParameters, 4034, PATCH),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 5344, PATCH), // 5233
// REGISTER_OOVPA(D3DDevice_Unknown1, 5233, PATCH)
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 4134, DISABLED), // Beware of the typo...
REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 5344, 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_BeginPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 4627, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5233, DISABLED),
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5344, PATCH),
REGISTER_OOVPA(D3DDevice_EndPush, 5233, PATCH), // Was 4627
REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 5233, PATCH),
REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4361, PATCH),