diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl index 4d8bf24fe..c7e6224b8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl @@ -101,7 +101,6 @@ OOVPA_NO_XREF(D3DDevice_GetTexture2, 3911, 21) // Also for 4361 { 0x1F, 0x16 }, OOVPA_END; - // ****************************************************************** // * D3DDevice_SetTexture // ****************************************************************** @@ -150,6 +149,7 @@ OOVPA_END; // * D3DDevice_DrawRectPatch // ****************************************************************** OOVPA_NO_XREF(D3DDevice_DrawRectPatch, 3911, 27) // Also verified for 4361, 4627, 5344, 5558, 5659, 5788, 5849, 5933 + { 0x00, 0x83 }, { 0x01, 0xEC }, { 0x02, 0x38 }, @@ -221,7 +221,7 @@ OOVPA_END; // * D3DDevice_CreateVertexShader // ****************************************************************** // Based on Dxbx patterns for 3911, 4361, 4627, 5344, 5558, 5659, 5788, 5849, 5933 -OOVPA_NO_XREF(D3DDevice_CreateVertexShader, 3925, 38) +OOVPA_NO_XREF(D3DDevice_CreateVertexShader, 3911, 38) // IDirect3DDevice8_CreateVertexShader+0x00 : push ecx; push ebx; push ebp { 0x00, 0x51 }, { 0x01, 0x53 }, @@ -303,7 +303,6 @@ OOVPA_NO_XREF(D3DDevice_CreateVertexShader, 3925, 38) */ OOVPA_END; - // ****************************************************************** // * D3DDevice_Release // ****************************************************************** @@ -463,7 +462,7 @@ OOVPA_XREF(D3DDevice_GetLightEnable, 3911, 1+24, // valid upto at least 5233, ne { 0x01, 0x4C }, { 0x02, 0x24 }, { 0x03, 0x04 }, - + { 0x04, 0xA1 }, { 0x09, 0x8B }, { 0x0A, 0x90 }, @@ -597,6 +596,7 @@ OOVPA_END; // * CMiniport::InitHardware // ****************************************************************** OOVPA_NO_XREF(CMiniport_InitHardware, 3911, 24) + { 0x00, 0x55 }, { 0x01, 0x8B }, { 0x02, 0xEC }, @@ -629,6 +629,7 @@ OOVPA_END; // * CMiniport::CreateCtxDmaObject // ****************************************************************** OOVPA_NO_XREF(CMiniport_CreateCtxDmaObject, 3911, 32) + { 0x00, 0x55 }, { 0x01, 0x8B }, { 0x02, 0xEC }, @@ -1071,3 +1072,3317 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 3911, 12) { 0x1A, 0x83 }, { 0x23, 0x8B }, OOVPA_END; + +// ****************************************************************** +// * D3DDevice_IsBusy +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_IsBusy, 3911, 8) + + { 0x0B, 0x8B }, + { 0x0C, 0x90 }, + { 0x0D, 0x04 }, + { 0x0E, 0x04 }, + + { 0x1E, 0x74 }, + { 0x1F, 0x06 }, + + { 0x25, 0xC3 }, + + { 0x33, 0xC3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetDeviceCaps +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetDeviceCaps, 3911, 11) + + // D3DDevice_GetDeviceCaps+0x00 : push esi; push edi + { 0x00, 0x56 }, + { 0x01, 0x57 }, + + // D3DDevice_GetDeviceCaps+0x06 : mov ecx, 0x35 + { 0x06, 0xB9 }, + { 0x07, 0x35 }, + { 0x08, 0x00 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + + // D3DDevice_GetDeviceCaps+0x10 : rep movsd + { 0x10, 0xF3 }, + { 0x11, 0xA5 }, + + // D3DDevice_GetDeviceCaps+0x14 : retn 0x04 + { 0x14, 0xC2 }, + { 0x15, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_BeginVisibilityTest +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest, 3911, 11) + + // D3DDevice_BeginVisibilityTest+0x0D : mov ecx, 1 + { 0x0D, 0xB9 }, + { 0x0E, 0x01 }, + { 0x0F, 0x00 }, + + // D3DDevice_BeginVisibilityTest+0x12 : mov dword ptr [eax], 0x000817C8 + { 0x12, 0xC7 }, + { 0x13, 0x00 }, + { 0x14, 0xC8 }, + { 0x15, 0x17 }, + { 0x16, 0x08 }, + + // D3DDevice_BeginVisibilityTest+0x1E : add eax, 0x0C + { 0x1E, 0x83 }, + { 0x1F, 0xC0 }, + { 0x20, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetMaterial +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetMaterial, 3911, 9) + + { 0x05, 0x56 }, + { 0x06, 0x57 }, + { 0x0A, 0x0C }, + { 0x0C, 0xB0 }, + { 0x0D, 0x18 }, + { 0x0E, 0x0B }, + { 0x11, 0xB9 }, + { 0x16, 0xF3 }, + { 0x1A, 0xC2 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_EndVisibilityTest +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 3911, 13) + + // D3DDevice_EndVisibilityTest+0x11 : mov eax, 0x8007000E + { 0x11, 0xB8 }, + { 0x12, 0x0E }, + { 0x13, 0x00 }, + { 0x14, 0x07 }, + { 0x15, 0x80 }, + + // D3DDevice_EndVisibilityTest+0x2D : mov dword ptr [eax], 0x000817CC + { 0x2D, 0xC7 }, + { 0x2E, 0x00 }, + { 0x2F, 0xCC }, + { 0x30, 0x17 }, + { 0x31, 0x08 }, + + // D3DDevice_EndVisibilityTest+0x43 : add eax, 0x0C + { 0x43, 0x83 }, + { 0x44, 0xC0 }, + { 0x45, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVisibilityTestResult +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult, 3911, 11) + + // D3DDevice_GetVisibilityTestResult+0x0C : shr ecx, 8 + { 0x0C, 0xC1 }, + { 0x0D, 0xE9 }, + { 0x0E, 0x08 }, + + // D3DDevice_GetVisibilityTestResult+0x0F : and eax, 0xFF + { 0x0F, 0x25 }, + { 0x10, 0xFF }, + { 0x11, 0x00 }, + + // D3DDevice_GetVisibilityTestResult+0x2B : mov eax, 0x88760828 + { 0x2B, 0xB8 }, + { 0x2C, 0x28 }, + { 0x2D, 0x08 }, + { 0x2E, 0x76 }, + { 0x2F, 0x88 }, +OOVPA_END; + +// ****************************************************************** +// * D3D::CDevice::KickOff +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_KickOff, 3911, 10) + + { 0x01, 0xA1 }, + + { 0x32, 0x81 }, + { 0x33, 0xCA }, + { 0x36, 0x01 }, + + { 0x5E, 0x89 }, + { 0x5F, 0x50 }, + { 0x60, 0x40 }, + + { 0x90, 0x83 }, + { 0x91, 0xEA }, + { 0x92, 0x02 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_LoadVertexShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_LoadVertexShader, 3911, 10) + + // D3DDevice_LoadVertexShader+0x07 : mov al, [ebx+0x0C] + { 0x07, 0x8A }, + { 0x08, 0x43 }, + { 0x09, 0x0C }, + + // D3DDevice_LoadVertexShader+0x3D : mov dword ptr [eax], 0x00041E9C + { 0x3D, 0xC7 }, + { 0x3E, 0x00 }, + { 0x3F, 0x9C }, + { 0x40, 0x1E }, + { 0x41, 0x04 }, + + // D3DDevice_LoadVertexShader+0x4E : mov [ebx], ebx + { 0x4E, 0x89 }, + { 0x4F, 0x13 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SelectVertexShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SelectVertexShader, 3911, 11) + + // D3DDevice_SelectVertexShader+0x16 : or ecx, 0x3A0 + { 0x16, 0x81 }, + { 0x17, 0xC9 }, + { 0x18, 0xA0 }, + { 0x19, 0x03 }, + + // D3DDevice_SelectVertexShader+0x3F : mov dword ptr [eax], 0x00081E94 + { 0x3F, 0xC7 }, + { 0x40, 0x00 }, + { 0x41, 0x94 }, + { 0x42, 0x1E }, + { 0x43, 0x08 }, + + // D3DDevice_SelectVertexShader+0x51 : mov [esi], eax + { 0x51, 0x89 }, + { 0x52, 0x06 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_BlockUntilVerticalBlank +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank, 3911, 14) + + // D3DDevice_BlockUntilVerticalBlank+0x05 : push 0;push 0;push 1 + { 0x05, 0x6A }, + { 0x06, 0x00 }, + { 0x07, 0x6A }, + { 0x08, 0x00 }, + { 0x09, 0x6A }, + { 0x0A, 0x01 }, + + // D3DDevice_BlockUntilVerticalBlank+0x0B : mov dword ptr [eax+0x24F4], + { 0x0B, 0xC7 }, + { 0x0C, 0x80 }, + { 0x0D, 0xF4 }, + { 0x0E, 0x24 }, + { 0x0F, 0x00 }, + + // D3DDevice_BlockUntilVerticalBlank+0x17 : and eax, 0x24F0 + { 0x17, 0x05 }, + { 0x18, 0xF0 }, + { 0x19, 0x24 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVerticalBlankCallback +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback, 3911, 12) + + // D3DDevice_SetVerticalBlankCallback+0x00 : mov eax, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // D3DDevice_SetVerticalBlankCallback+0x0A : mov [ecx+0x24EC], eax + { 0x0A, 0x89 }, + { 0x0B, 0x81 }, + { 0x0C, 0xEC }, + { 0x0D, 0x24 }, + { 0x0E, 0x00 }, + + // D3DDevice_SetVerticalBlankCallback+0x10 : retn 0x04 + { 0x10, 0xC2 }, + { 0x11, 0x04 }, + { 0x12, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderTarget +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3911, 11) + + // D3DDevice_SetRenderTarget+0x00 : sub esp, 0x20 + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x20 }, + + // D3DDevice_SetRenderTarget+0x32 : mov [esp+0x34], ebx + { 0x32, 0x89 }, + { 0x33, 0x5C }, + { 0x34, 0x24 }, + { 0x35, 0x34 }, + + // D3DDevice_SetRenderTarget+0x55 : and ecx, 0x0F + { 0x55, 0x83 }, + { 0x56, 0xE1 }, + { 0x57, 0x0F }, + + // D3DDevice_SetRenderTarget+0xDC : push edx + { 0xDC, 0x52 }, +OOVPA_END; + +// ****************************************************************** +// * D3DSurface_GetDesc +// ****************************************************************** +OOVPA_NO_XREF(D3DSurface_GetDesc, 3911, 16) + + // D3DSurface_GetDesc+0x00 : mov eax, [esp+0x08] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x08 }, + + // D3DSurface_GetDesc+0x04 : mov ecx, [esp+0x04] + { 0x04, 0x8B }, + { 0x05, 0x4C }, + { 0x06, 0x24 }, + { 0x07, 0x04 }, + + // D3DSurface_GetDesc+0x08 : push eax + { 0x08, 0x50 }, + + // D3DSurface_GetDesc+0x09 : push 0 + { 0x09, 0x6A }, + { 0x0A, 0x00 }, + + // D3DSurface_GetDesc+0x0B : push ecx + { 0x0B, 0x51 }, + + // D3DSurface_GetDesc+0x0C : call [abs] + { 0x0C, 0xE8 }, + + // D3DSurface_GetDesc+0x11 : retn 0x08 + { 0x11, 0xC2 }, + { 0x12, 0x08 }, + { 0x13, 0x00 }, + +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetTransform +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetTransform, 3911, 12) + + // D3DDevice_GetTransform+0x06 : mov esi, [esp+4+arg_0] + { 0x06, 0x8B }, + { 0x07, 0x74 }, + { 0x08, 0x24 }, + + // D3DDevice_GetTransform+0x12 : shl esi, 6; add esi, eax + { 0x12, 0xC1 }, + { 0x13, 0xE6 }, + { 0x14, 0x06 }, + { 0x15, 0x03 }, + { 0x16, 0xF0 }, + + // D3DDevice_GetTransform+0x17 : mov ecx, 0x10 + { 0x17, 0xB9 }, + { 0x18, 0x10 }, + + // D3DDevice_GetTransform+0x20 : retn 0x08 + { 0x20, 0xC2 }, + { 0x21, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetStreamSource +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetStreamSource, 3911, 12) + + // D3DDevice_SetStreamSource+0x39 : add edx, 0xFFF80000 + { 0x39, 0x81 }, + { 0x3A, 0xC2 }, + { 0x3B, 0x00 }, + { 0x3C, 0x00 }, + { 0x3D, 0xF8 }, + { 0x3E, 0xFF }, + + // D3DDevice_SetStreamSource+0x49 : jnz +0x06 + { 0x49, 0x75 }, + { 0x4A, 0x06 }, + + // D3DDevice_SetStreamSource+0x6A : or ecx, 0x280 + { 0x6A, 0x81 }, + { 0x6B, 0xC9 }, + { 0x6C, 0x80 }, + { 0x6D, 0x02 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexShader, 3911, 14) + + // D3DDevice_SetVertexShader+0x05 : test bl, 1 + { 0x05, 0xF6 }, + { 0x06, 0xC3 }, + { 0x07, 0x01 }, + + // D3DDevice_SetVertexShader+0x10 : mov eax, [esi+0x0470] + { 0x10, 0x8B }, + { 0x11, 0x86 }, + { 0x12, 0x70 }, + { 0x13, 0x04 }, + + // D3DDevice_SetVertexShader+0x6D : retn 0x04 + { 0x6D, 0xC2 }, + { 0x6E, 0x04 }, + + // D3DDevice_SetVertexShader+0x8C : mov dword ptr [eax], 0x81E94 + { 0x8C, 0xC7 }, + { 0x8D, 0x40 }, + { 0x8E, 0x08 }, + { 0x8F, 0x94 }, + { 0x90, 0x1E }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreatePixelShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreatePixelShader, 3911, 11) + + // D3DDevice_CreatePixelShader+0x00 : push 0xFC + { 0x00, 0x68 }, + { 0x01, 0xFC }, + + // D3DDevice_CreatePixelShader+0x10 : mov eax, 0x8007000E + { 0x10, 0xB8 }, + { 0x11, 0x0E }, + { 0x12, 0x00 }, + { 0x13, 0x07 }, + { 0x14, 0x80 }, + + // D3DDevice_CreatePixelShader+0x31 : mov ecx, 0x3C + { 0x31, 0xB9 }, + { 0x32, 0x3C }, + + // D3DDevice_CreatePixelShader+0x42 : retn 0x08 + { 0x42, 0xC2 }, + { 0x43, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetPixelShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetPixelShader, 3911, 10) + + // D3DDevice_SetPixelShader+0x0E : mov esi, [ebx+0x0414] + { 0x0E, 0x8B }, + { 0x0F, 0xB3 }, + { 0x10, 0x14 }, + { 0x11, 0x04 }, + + // D3DDevice_SetPixelShader+0x34 : or eax, 0x40 + { 0x35, 0xC8 }, + { 0x36, 0x40 }, + + // D3DDevice_SetPixelShader+0x68 : retn 0x04 + { 0x68, 0xC2 }, + { 0x69, 0x04 }, + + // D3DDevice_SetPixelShader+0xE3 : rep movsd + { 0xE3, 0xF3 }, + { 0xE4, 0xA5 }, + +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetIndices +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetIndices, 3911, 11) + + // D3DDevice_SetIndices+0x0E : jz +0x10 + { 0x0E, 0x74 }, + { 0x0F, 0x10 }, + + // D3DDevice_SetIndices+0x3E : test ecx, 0x78FFFF + { 0x3E, 0xF7 }, + { 0x3F, 0xC1 }, + { 0x40, 0xFF }, + { 0x41, 0xFF }, + { 0x42, 0x78 }, + + // D3DDevice_SetIndices+0x67 : mov [esi+0x047C], edi + { 0x67, 0x89 }, + { 0x68, 0xBE }, + { 0x69, 0x7C }, + { 0x6A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetViewport +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetViewport, 3911, 10) + + // D3DDevice_SetViewport+0x00 : sub esp, 0x08 + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x08 }, + + // D3DDevice_SetViewport+0x2F : mov ebx, [esp+0x1C] + { 0x2F, 0x8B }, + { 0x30, 0x5C }, + { 0x31, 0x24 }, + { 0x32, 0x1C }, + + // D3DDevice_SetViewport+0x55 : jnz +0x12 + { 0x55, 0x75 }, + { 0x56, 0x12 }, + + // D3DDevice_SetViewport+0x9D : inc edx + { 0x9D, 0x42 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DrawIndexedVertices +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices, 3911, 12) + + // D3DDevice_DrawIndexedVertices+0x0E : mov eax, [esi+0x0478] + { 0x0E, 0x8B }, + { 0x0F, 0x86 }, + { 0x10, 0x78 }, + { 0x11, 0x04 }, + + // D3DDevice_DrawIndexedVertices+0x44 : mov dword ptr [ebx-8], 0x000417FC + { 0x44, 0xC7 }, + { 0x45, 0x43 }, + { 0x46, 0xF8 }, + { 0x47, 0xFC }, + { 0x48, 0x17 }, + { 0x49, 0x04 }, + + // D3DDevice_DrawIndexedVertices+0xDA : lea ebx, [ebx+0] + { 0xDA, 0x8D }, + { 0xDB, 0x9B }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_Begin +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_Begin, 3911, 11) + + // D3DDevice_Begin+0x20 : mov dword ptr [eax], 0x417FC + { 0x20, 0xC7 }, + { 0x21, 0x00 }, + { 0x22, 0xFC }, + { 0x23, 0x17 }, + { 0x24, 0x04 }, + { 0x25, 0x00 }, + + // D3DDevice_Begin+0x2E : shl edx, 6 + { 0x2E, 0x0D }, + { 0x2F, 0x00 }, + { 0x30, 0x08 }, + + // D3DDevice_Begin+0x38 : retn 0x08 + { 0x38, 0xC2 }, + { 0x39, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexData2f +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexData2f, 3911, 14) + + // D3DDevice_SetVertexData2f+0x11 : lea edx, ds:abs[ecx*8] + { 0x11, 0x8D }, + { 0x12, 0x14 }, + { 0x13, 0xCD }, + + // D3DDevice_SetVertexData2f+0x1C : mov [eax], edx; mov edx, [esp+0x10] + { 0x1C, 0x89 }, + { 0x1D, 0x10 }, + { 0x1E, 0x8B }, + { 0x1F, 0x54 }, + { 0x20, 0x24 }, + { 0x21, 0x10 }, + + // D3DDevice_SetVertexData2f+0x28 : add eax, 0x0C + { 0x28, 0x83 }, + { 0x29, 0xC0 }, + { 0x2A, 0x0C }, + + // D3DDevice_SetVertexData2f+0x2E : retn 0x0C + { 0x2E, 0xC2 }, + { 0x2F, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexData2s +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexData2s, 3911, 11) + + // D3DDevice_SetVertexData2s+0x11 : lea edx, ds:abs[ecx*4] + { 0x11, 0x8D }, + { 0x12, 0x14 }, + { 0x13, 0x8D }, + + // D3DDevice_SetVertexData2s+0x24 : shl ecx, 0x10 + { 0x24, 0xC1 }, + { 0x25, 0xE1 }, + { 0x26, 0x10 }, + + // D3DDevice_SetVertexData2s+0x29 : mov [eax+4], ecx + { 0x29, 0x89 }, + { 0x2A, 0x48 }, + { 0x2B, 0x04 }, + + // D3DDevice_SetVertexData2s+0x32 : retn 0x0C + { 0x32, 0xC2 }, + { 0x33, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexData4f +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexData4f, 3911, 11) + + // D3DDevice_SetVertexData4f+0x11 : cmp ecx, -1; jnz +0x07 + { 0x11, 0x83 }, + { 0x12, 0xF9 }, + { 0x13, 0xFF }, + { 0x14, 0x75 }, + { 0x15, 0x07 }, + + // D3DDevice_SetVertexData4f+0x1D : add ecx, 0x01A0 + { 0x1D, 0x81 }, + { 0x1E, 0xC1 }, + { 0x1F, 0xA0 }, + { 0x20, 0x01 }, + + // D3DDevice_SetVertexData4f+0x50 : retn 0x14 + { 0x50, 0xC2 }, + { 0x51, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexDataColor +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexDataColor, 3911, 18) + + // D3DDevice_SetVertexDataColor+0x00 : push esi + { 0x00, 0x56 }, + + // D3DDevice_SetVertexDataColor+0x1F : mov byte ptr [esp+?] + { 0x1F, 0x0F }, + { 0x20, 0xB6 }, + { 0x21, 0x54 }, + { 0x22, 0x24 }, + { 0x23, 0x12 }, + + // D3DDevice_SetVertexDataColor+0x26 : add edi, 0xFF; shl edi, 0x10 + { 0x26, 0x81 }, + { 0x27, 0xE7 }, + { 0x28, 0xFF }, + { 0x2C, 0xC1 }, + { 0x2D, 0xE7 }, + { 0x2E, 0x10 }, + + // D3DDevice_SetVertexDataColor+0x31 : and ecx, 0xFF00FF00 + { 0x31, 0x81 }, + { 0x32, 0xE1 }, + { 0x33, 0x00 }, + { 0x34, 0xFF }, + { 0x35, 0x00 }, + { 0x36, 0xFF }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_End +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_End, 3911, 12) + + // D3DDevice_End+0x17 : mov dword ptr [eax], 0x417FC + { 0x17, 0xC7 }, + { 0x18, 0x00 }, + { 0x19, 0xFC }, + { 0x1A, 0x17 }, + { 0x1B, 0x04 }, + { 0x1C, 0x00 }, + + // D3DDevice_End+0x2C : test ah, 0x10 + { 0x2C, 0xF6 }, + { 0x2D, 0xC4 }, + { 0x2E, 0x10 }, + + // D3DDevice_End+0x2F : jz +0x07 + { 0x2F, 0x74 }, + { 0x30, 0x07 }, + + // D3DDevice_End+0x40 : retn + { 0x40, 0xC3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_Clear +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_Clear, 3911, 10) + + // D3DDevice_Clear+0x00 : sub esp, 0x38 + { 0x00, 0x83 }, + { 0x01, 0xEC }, + { 0x02, 0x38 }, + + // D3DDevice_Clear+0x25 : test cl, 1 + { 0x25, 0xF6 }, + { 0x26, 0xC1 }, + { 0x27, 0x01 }, + + // D3DDevice_Clear+0x5D : mov [esi], eax; xor ebp, ebp + { 0x5D, 0x89 }, + { 0x5E, 0x06 }, + { 0x5F, 0x33 }, + { 0x60, 0xED }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreatePalette +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreatePalette, 3911, 12) + + // D3DDevice_CreatePalette+0x01 : push 0x0C + { 0x01, 0x6A }, + { 0x02, 0x0C }, + + // D3DDevice_CreatePalette+0x03 : push 0x40 + { 0x03, 0x6A }, + { 0x04, 0x40 }, + + // D3DDevice_CreatePalette+0x10 : mov eax, 0x8007000E + { 0x10, 0xB8 }, + { 0x11, 0x0E }, + { 0x12, 0x00 }, + { 0x13, 0x07 }, + { 0x14, 0x80 }, + + // D3DDevice_CreatePalette+0x4E : shl esi, 0x1E + { 0x4E, 0xC1 }, + { 0x4F, 0xE6 }, + { 0x50, 0x1E }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetPalette +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetPalette, 3911, 12) + + // D3DDevice_SetPalette+0x0D : mov eax, [edi+esi*4+0x0BB0] + { 0x0D, 0x8B }, + { 0x0E, 0x84 }, + { 0x0F, 0xB7 }, + { 0x10, 0xB0 }, + { 0x11, 0x0B }, + + // D3DDevice_SetPalette+0x68 : add esi, 0x41B20 + { 0x68, 0x81 }, + { 0x69, 0xC6 }, + { 0x6A, 0x20 }, + { 0x6B, 0x1B }, + { 0x6C, 0x04 }, + + // D3DDevice_SetPalette+0x7C : retn 0x08 + { 0x7C, 0xC2 }, + { 0x7D, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateTexture +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateTexture, 3911, 14) + + // D3DDevice_CreateTexture+0x00 : mov eax, [esp+0x1C] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x1C }, + + // D3DDevice_CreateTexture+0x0C : push eax + { 0x0C, 0x50 }, + + // D3DDevice_CreateTexture+0x11 : push 0 + { 0x11, 0x6A }, + { 0x12, 0x00 }, + + // D3DDevice_CreateTexture+0x13 : push 0 + { 0x13, 0x6A }, + { 0x14, 0x00 }, + + // D3DDevice_CreateTexture+0x15 : push ecx + { 0x15, 0x51 }, + + // D3DDevice_CreateTexture+0x22 : push ecx + { 0x22, 0x51 }, + + // D3DDevice_CreateTexture+0x23 : push edx + { 0x23, 0x52 }, + + // D3DDevice_CreateTexture+0x29 : retn 0x1C + { 0x29, 0xC2 }, + { 0x2A, 0x1C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateVolumeTexture +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateVolumeTexture, 3911, 15) + + // D3DDevice_CreateVolumeTexture+0x00 : mov eax, [esp+0x1C] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x20 }, + + // D3DDevice_CreateVolumeTexture+0x0C : push eax + { 0x0C, 0x50 }, + + // D3DDevice_CreateVolumeTexture+0x11 : push 1 + { 0x11, 0x6A }, + { 0x12, 0x01 }, + + // D3DDevice_CreateVolumeTexture+0x13 : push 0 + { 0x13, 0x6A }, + { 0x14, 0x00 }, + + // D3DDevice_CreateVolumeTexture+0x16 : mov ecx, [esp+0x1C] + { 0x16, 0x8B }, + { 0x17, 0x4C }, + { 0x18, 0x24 }, + { 0x19, 0x1C }, + + // D3DDevice_CreateVolumeTexture+0x2C : retn 0x20 + { 0x2C, 0xC2 }, + { 0x2D, 0x20 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateCubeTexture +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateCubeTexture, 3911, 15) + + // D3DDevice_CreateCubeTexture+0x00 : mov eax, [esp+0x1C] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x18 }, + + // D3DDevice_CreateCubeTexture+0x0C : push eax + { 0x0C, 0x50 }, + + // D3DDevice_CreateCubeTexture+0x11 : push 0 + { 0x11, 0x6A }, + { 0x12, 0x00 }, + + // D3DDevice_CreateCubeTexture+0x13 : push 1 + { 0x13, 0x6A }, + { 0x14, 0x01 }, + + // D3DDevice_CreateCubeTexture+0x18 : mov eax, [esp+0x1C] + { 0x18, 0x8B }, + { 0x19, 0x44 }, + { 0x1A, 0x24 }, + { 0x1B, 0x1C }, + + // D3DDevice_CreateCubeTexture+0x25 : retn 0x18 + { 0x25, 0xC2 }, + { 0x26, 0x18 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateIndexBuffer +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateIndexBuffer, 3911, 13) + + // D3DDevice_CreateIndexBuffer+0x13 : mov eax, 0x8007000E + { 0x13, 0xB8 }, + { 0x14, 0x0E }, + { 0x15, 0x00 }, + { 0x16, 0x07 }, + { 0x17, 0x80 }, + + // D3DDevice_CreateIndexBuffer+0x18 : retn 0x14 + { 0x18, 0xC2 }, + { 0x19, 0x14 }, + + // D3DDevice_CreateIndexBuffer+0x2E : mov dword ptr [eax], 0x1010001 + { 0x2E, 0xC7 }, + { 0x2F, 0x00 }, + { 0x30, 0x01 }, + { 0x31, 0x00 }, + { 0x32, 0x01 }, + { 0x33, 0x01 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexShaderConstant +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant, 3911, 10) + + // D3DDevice_SetVertexShaderConstant+0x11 : mov cl, [ebx+0x0C] + { 0x11, 0x8A }, + { 0x12, 0x4B }, + { 0x13, 0x0C }, + + // D3DDevice_SetVertexShaderConstant+0x1A : test cl, 0x10 + { 0x1A, 0xF6 }, + { 0x1B, 0xC1 }, + { 0x1C, 0x10 }, + + // D3DDevice_SetVertexShaderConstant+0x63 : jle +0x19 + { 0x63, 0x7E }, + { 0x64, 0x19 }, + + // D3DDevice_SetVertexShaderConstant+0x9B : retn 0x0C + { 0x9B, 0xC2 }, + { 0x9C, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetFlickerFilter +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetFlickerFilter, 3911, 12) + + // D3DDevice_SetFlickerFilter+0x0A : mov edx, [ecx+0x2308] + { 0x0A, 0x8B }, + { 0x0B, 0x91 }, + { 0x0C, 0x08 }, + { 0x0D, 0x23 }, + + // D3DDevice_SetFlickerFilter+0x10 : push 0; push eax; push 0x0B; push edx + { 0x10, 0x6A }, + { 0x11, 0x00 }, + { 0x12, 0x50 }, + { 0x13, 0x6A }, + { 0x14, 0x0B }, + { 0x15, 0x52 }, + + // D3DDevice_SetFlickerFilter+0x1C : retn 0x08 + { 0x1C, 0xC2 }, + { 0x1D, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetSoftDisplayFilter +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter, 3911, 12) + + // D3DDevice_SetSoftDisplayFilter+0x0A : mov edx, [ecx+0x2308] + { 0x0A, 0x8B }, + { 0x0B, 0x91 }, + { 0x0C, 0x08 }, + { 0x0D, 0x23 }, + + // D3DDevice_SetSoftDisplayFilter+0x10 : push 0; push eax; push 0x0E; push edx + { 0x10, 0x6A }, + { 0x11, 0x00 }, + { 0x12, 0x50 }, + { 0x13, 0x6A }, + { 0x14, 0x0E }, + { 0x15, 0x52 }, + + // D3DDevice_SetSoftDisplayFilter+0x1C : retn 0x08 + { 0x1C, 0xC2 }, + { 0x1D, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetTextureState_BorderColor +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor, 3911, 13) + + // D3DDevice_SetTextureState_BorderColor+0x13 : shl eax, 0x07 + { 0x13, 0xC1 }, + { 0x14, 0xE2 }, + { 0x15, 0x06 }, + + // D3DDevice_SetTextureState_BorderColor+0x16 : add edx, 0x41B24 + { 0x16, 0x81 }, + { 0x17, 0xC2 }, + { 0x18, 0x24 }, + { 0x19, 0x1B }, + { 0x1A, 0x04 }, + + // D3DDevice_SetTextureState_BorderColor+0x2A : shl ecx, 7 + { 0x2A, 0xC1 }, + { 0x2B, 0xE1 }, + { 0x2C, 0x07 }, + + // D3DDevice_SetTextureState_BorderColor+0x34 : retn 0x08 + { 0x34, 0xC2 }, + { 0x35, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_PSTextureModes +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_PSTextureModes, 3911, 11) + + // D3DDevice_SetRenderState_PSTextureModes+0x0C : or edx, 0x400 + { 0x0C, 0x81 }, + { 0x0D, 0xCA }, + { 0x0E, 0x00 }, + { 0x0F, 0x04 }, + + // D3DDevice_SetRenderState_PSTextureModes+0x12 : mov [eax+0x420], ecx + { 0x12, 0x89 }, + { 0x13, 0x88 }, + { 0x14, 0x20 }, + { 0x15, 0x04 }, + { 0x16, 0x00 }, + + // D3DDevice_SetRenderState_PSTextureModes+0x21 : retn 4 + { 0x21, 0xC2 }, + { 0x22, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_StencilFail +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail, 3911, 12) + + // D3DDevice_SetRenderState_StencilFail+0x19 : mov ecx, 2 + { 0x19, 0xB9 }, + { 0x1A, 0x02 }, + { 0x1B, 0x00 }, + + // D3DDevice_SetRenderState_StencilFail+0x3E : or ecx, 1 + { 0x3E, 0x83 }, + { 0x3F, 0xC9 }, + { 0x40, 0x01 }, + + // D3DDevice_SetRenderState_StencilFail+0x48 : mov dword ptr [eax], 0x00041D84 + { 0x48, 0xC7 }, + { 0x49, 0x00 }, + { 0x4A, 0x84 }, + { 0x4B, 0x1D }, + { 0x4C, 0x04 }, + { 0x4D, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_Simple +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_Simple, 3911, 13) + + // D3DDevice_SetRenderState_Simple+0x05 : add eax, 0x08 + { 0x05, 0x83 }, + { 0x06, 0xC0 }, + { 0x07, 0x08 }, + + // D3DDevice_SetRenderState_Simple+0x0E : jnb +0x0C + { 0x0E, 0x73 }, + { 0x0F, 0x0C }, + + // D3DDevice_SetRenderState_Simple+0x15 : mov [eax-8], ecx + { 0x15, 0x89 }, + { 0x16, 0x48 }, + { 0x17, 0xF8 }, + + // D3DDevice_SetRenderState_Simple+0x18 : mov [eax-4], ecx + { 0x18, 0x89 }, + { 0x19, 0x50 }, + { 0x1A, 0xFC }, + + // D3DDevice_SetRenderState_Simple+0x2B : jmp +0xD3 + { 0x2B, 0xEB }, + { 0x2C, 0xD3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetTransform +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetTransform, 3911, 10) + + // D3DDevice_SetTransform+0x3A : fld dword ptr [edx+0x28] + { 0x3A, 0xD9 }, + { 0x3B, 0x42 }, + { 0x3C, 0x28 }, + + // D3DDevice_SetTransform+0x47 : test ah, 0x44 + { 0x47, 0xF6 }, + { 0x48, 0xC4 }, + { 0x49, 0x44 }, + + // D3DDevice_SetTransform+0x55 : fnstsw ax + { 0x55, 0xDF }, + { 0x56, 0xE0 }, + + // D3DDevice_SetTransform+0x7A : fdivp st(1), st + { 0x7A, 0xDE }, + { 0x7B, 0xF9 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_FogColor +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_FogColor, 3911, 11) + + // D3DDevice_SetRenderState_FogColor+0x2E : mov dword ptr [eax], 0x402A8 + { 0x2E, 0xC7 }, + { 0x2F, 0x00 }, + { 0x30, 0xA8 }, + { 0x31, 0x02 }, + { 0x32, 0x04 }, + { 0x33, 0x00 }, + + // D3DDevice_SetRenderState_FogColor+0x37 : add eax, 0x08 + { 0x37, 0x83 }, + { 0x38, 0xC0 }, + { 0x39, 0x08 }, + + // D3DDevice_SetRenderState_FogColor+0x44 : retn 0x04 + { 0x44, 0xC2 }, + { 0x45, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_FillMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode, 3911, 11) + + // D3DDevice_SetRenderState_FillMode+0x23 : mov dword ptr [eax], 0x8038C + { 0x23, 0xC7 }, + { 0x24, 0x00 }, + { 0x25, 0x8C }, + { 0x26, 0x03 }, + { 0x27, 0x08 }, + { 0x28, 0x00 }, + + // D3DDevice_SetRenderState_FillMode+0x2F : add eax, 0x0C + { 0x2F, 0x83 }, + { 0x30, 0xC0 }, + { 0x31, 0x0C }, + + // D3DDevice_SetRenderState_FillMode+0x3B : retn 0x04 + { 0x3B, 0xC2 }, + { 0x3C, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_StencilEnable +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable, 3911, 11) + + // D3DDevice_SetRenderState_StencilEnable+0x45 : mov dword ptr [eax], 0x41D84 + { 0x45, 0xC7 }, + { 0x46, 0x00 }, + { 0x47, 0x84 }, + { 0x48, 0x1D }, + { 0x49, 0x04 }, + { 0x4A, 0x00 }, + + // D3DDevice_SetRenderState_StencilEnable+0x71 : add eax, 0x08 + { 0x71, 0x83 }, + { 0x72, 0xC0 }, + { 0x73, 0x08 }, + + // D3DDevice_SetRenderState_StencilEnable+0x7D : retn 0x04 + { 0x7D, 0xC2 }, + { 0x7E, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_Dxt1NoiseEnable +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 3911, 11) + + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x0C : mov eax, [esi+0x040C] + { 0x0C, 0x8B }, + { 0x0D, 0x86 }, + { 0x0E, 0x0C }, + { 0x0F, 0x04 }, + { 0x10, 0x00 }, + { 0x11, 0x00 }, + + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x22 : cmp dl, 0x20 + { 0x22, 0x80 }, + { 0x23, 0xFA }, + { 0x24, 0x20 }, + + // D3DDevice_SetRenderState_Dxt1NoiseEnable+0x74 : retn 0x04 + { 0x74, 0xC2 }, + { 0x75, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_ZBias +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZBias, 3911, 10) + + // D3DDevice_SetRenderState_ZBias+0x0B : setnz al + { 0x0B, 0x0F }, + { 0x0C, 0x95 }, + { 0x0D, 0xC0 }, + + // D3DDevice_SetRenderState_ZBias+0x14 : fild [esp+0x10] + { 0x14, 0xDB }, + { 0x15, 0x44 }, + { 0x16, 0x24 }, + + // D3DDevice_SetRenderState_ZBias+0x45 : push 0x4E + { 0x45, 0x6A }, + { 0x46, 0x4E }, + + // D3DDevice_SetRenderState_ZBias+0x45 : retn 0x04 + { 0x71, 0xC2 }, + { 0x72, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_ZEnable +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable, 3911, 13) + + // D3DDevice_SetRenderState_ZEnable+0x13 : jz +0x11 + { 0x13, 0x74 }, + { 0x14, 0x11 }, + + // D3DDevice_SetRenderState_ZEnable+0x15 : mov edx, [esi+0x0410] + { 0x15, 0x8B }, + { 0x16, 0x96 }, + { 0x17, 0x10 }, + { 0x18, 0x04 }, + + // D3DDevice_SetRenderState_ZEnable+0x28 : mov dword ptr [eax], 0x4030 + { 0x28, 0xC7 }, + { 0x29, 0x00 }, + { 0x2A, 0x0C }, + { 0x2B, 0x03 }, + { 0x2C, 0x04 }, + + // D3DDevice_SetRenderState_ZEnable+0x69 : retn 0x04 + { 0x69, 0xC2 }, + { 0x6A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_Present +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_Present, 3911, 10) + + // D3DDevice_Present+0x0A : push 2 + { 0x0A, 0x6A }, + { 0x0B, 0x02 }, + + // D3DDevice_Present+0x11 : mov eax, [esi+2518] + { 0x11, 0x8B }, + { 0x12, 0x86 }, + { 0x13, 0x18 }, + { 0x14, 0x25 }, + + // D3DDevice_Present+0xBE : shr ebx, 1 + { 0xBE, 0xD1 }, + { 0xBF, 0xEB }, + + // D3DDevice_Present+0xC0 : xor edi, edi + { 0xC0, 0x33 }, + { 0xC1, 0xFF }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetShaderConstantMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode, 3911, 12) + + // D3DDevice_SetShaderConstantMode+0x26 : mov [ebp+0x2140], eax + { 0x26, 0x89 }, + { 0x27, 0x85 }, + { 0x28, 0x40 }, + { 0x29, 0x21 }, + + // D3DDevice_SetShaderConstantMode+0x51 : mov dword ptr [ebx+0x04], 0x3C + { 0x51, 0xC7 }, + { 0x52, 0x43 }, + { 0x53, 0x04 }, + { 0x54, 0x3C }, + + // D3DDevice_SetShaderConstantMode+0xE4 : add ebx, 0x0124 + { 0xE4, 0x81 }, + { 0xE5, 0xC3 }, + { 0xE6, 0x24 }, + { 0xE7, 0x01 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetBackBuffer +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetBackBuffer, 3911, 12) + + // D3DDevice_GetBackBuffer+0x04 : cmp eax, 0xFFFFFFFF + { 0x04, 0x83 }, + { 0x05, 0xF8 }, + { 0x06, 0xFF }, + + // D3DDevice_GetBackBuffer+0x0D : jnz +0x07 + { 0x0D, 0x75 }, + { 0x0E, 0x07 }, + + // D3DDevice_GetBackBuffer+0x1E : lea eax, [ecx+eax*8+0x2150] + { 0x1E, 0x8D }, + { 0x1F, 0x84 }, + { 0x20, 0xC1 }, + { 0x21, 0x50 }, + { 0x22, 0x21 }, + + // D3DDevice_GetBackBuffer+0x31 : retn 0x0C + { 0x31, 0xC2 }, + { 0x32, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetRenderTarget +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetRenderTarget, 3911, 9) + + // D3DDevice_GetRenderTarget+0x00 : mov eax, [addr] + { 0x00, 0xA1 }, + + // D3DDevice_GetRenderTarget+0x05 : mov eax, [eax + 0x040C] + { 0x05, 0x8B }, + { 0x06, 0x80 }, + { 0x07, 0x0C }, + { 0x08, 0x04 }, + + // D3DDevice_GetRenderTarget+0x11 : mov [ecx], eax + { 0x11, 0x89 }, + { 0x12, 0x01 }, + + // D3DDevice_GetRenderTarget+0x1D : retn 0x04 + { 0x1D, 0xC2 }, + { 0x1E, 0x04 }, +OOVPA_END; + + + + +// ****************************************************************** +// * D3DDevice_CreateVertexBuffer +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer, 3911, 13) + + // D3DDevice_CreateVertexBuffer+0x03 : push 0x40 + { 0x03, 0x6A }, + { 0x04, 0x40 }, + + // D3DDevice_CreateVertexBuffer+0x10 : mov eax, [esp+8] + { 0x10, 0x8B }, + { 0x11, 0x44 }, + { 0x12, 0x24 }, + { 0x13, 0x08 }, + + // D3DDevice_CreateVertexBuffer+0x48 : mov dword ptr [esi], 0x01000001 + { 0x48, 0xC7 }, + { 0x49, 0x06 }, + { 0x4A, 0x01 }, + { 0x4B, 0x00 }, + { 0x4D, 0x01 }, + + // D3DDevice_CreateVertexBuffer+0x53 : retn 0x14 + { 0x53, 0xC2 }, + { 0x54, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * D3DVertexBuffer_Lock +// ****************************************************************** +OOVPA_NO_XREF(D3DVertexBuffer_Lock, 3911, 11) + + // D3DVertexBuffer_Lock+0x01 : mov bl, [esp+0x18] + { 0x01, 0x8A }, + { 0x02, 0x5C }, + { 0x03, 0x24 }, + { 0x04, 0x18 }, + + // D3DVertexBuffer_Lock+0x09 : jnz +0x24 + { 0x09, 0x75 }, + { 0x0A, 0x1E }, + + // D3DVertexBuffer_Lock+0x29 : test bl, 0xA0 + { 0x29, 0xF6 }, + { 0x2A, 0xC3 }, + { 0x2B, 0xA0 }, + + // D3DVertexBuffer_Lock+0x4A : retn 0x14 + { 0x4A, 0xC2 }, + { 0x4B, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_Register +// ****************************************************************** +OOVPA_NO_XREF(D3DResource_Register, 3911, 19) + + // D3DResource_Register+0x00 : mov ecx, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x4C }, + { 0x03, 0x04 }, + + // D3DResource_Register+0x04 : mov edx, [esp+0x08] + { 0x04, 0x8B }, + { 0x05, 0x54 }, + { 0x07, 0x08 }, + + // D3DResource_Register+0x08 : mov eax, [ecx+0x04] + { 0x08, 0x8B }, + { 0x09, 0x41 }, + { 0x0A, 0x04 }, + + // D3DResource_Register+0x0F : and edx, 0x00070000 + { 0x0F, 0x81 }, + { 0x10, 0xE2 }, + { 0x13, 0x07 }, + + // D3DResource_Register+0x15 : cmp edx, 0x00020000 + { 0x15, 0x81 }, + { 0x16, 0xFA }, + { 0x19, 0x02 }, + + // D3DResource_Register+0x1B : jnz +0x05 + { 0x1B, 0x74 }, + { 0x1C, 0x05 }, + + // D3DResource_Register+0x25 : retn 0x08 + { 0x25, 0xC2 }, + { 0x26, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_Release +// ****************************************************************** +OOVPA_NO_XREF(D3DResource_Release, 3911, 11) +#define D3DResource_Release_4627 D3DResource_Release_3911 + + // D3DResource_Release+0x09 : and ecx, 0xFFFF + { 0x09, 0x81 }, + { 0x0A, 0xE1 }, + { 0x0B, 0xFF }, + { 0x0C, 0xFF }, + + // D3DResource_Release+0x14 : and eax, 0x00070000 + { 0x14, 0x25 }, + { 0x17, 0x07 }, + + // D3DResource_Release+0x19 : cmp eax, 0x00050000 + { 0x19, 0x3D }, + { 0x1C, 0x05 }, + + // D3DResource_Release+0x3E : pop esi + { 0x3E, 0x5E }, + + // D3DResource_Release+0x4B : retn 0x04 + { 0x4B, 0xC2 }, + { 0x4C, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_AddRef +// ****************************************************************** +OOVPA_NO_XREF(D3DResource_AddRef, 3911, 10) + + // D3DResource_AddRef+0x07 : test eax, 0xFFFF + { 0x07, 0xA9 }, + { 0x08, 0xFF }, + { 0x09, 0xFF }, + + // D3DResource_AddRef+0x0E : and eax, 0x00070000 + { 0x0E, 0x25 }, + { 0x11, 0x07 }, + + // D3DResource_AddRef+0x13 : cmp eax, 0x00050000 + { 0x13, 0x3D }, + { 0x16, 0x05 }, + + // D3DResource_AddRef+0x33 : pop esi + { 0x33, 0x5E }, + + // D3DResource_AddRef+0x34 : retn 0x04 + { 0x34, 0xC2 }, + { 0x35, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_IsBusy +// ****************************************************************** +OOVPA_NO_XREF(D3DResource_IsBusy, 3911, 11) + + // D3DResource_IsBusy+0x24 : test eax, 0x780000 + { 0x24, 0xA9 }, + { 0x25, 0x00 }, + { 0x26, 0x00 }, + { 0x27, 0x78 }, + + // D3DResource_IsBusy+0x35 : jnz +0x44 + { 0x35, 0x75 }, + { 0x36, 0x44 }, + + // D3DResource_IsBusy+0x4E : mov eax, [ecx+0x14] + { 0x4E, 0x8B }, + { 0x4F, 0x41 }, + { 0x50, 0x14 }, + + // D3DResource_IsBusy+0x79 : jnb +0x09 + { 0x79, 0x73 }, + { 0x7A, 0x09 }, +OOVPA_END; + +// ****************************************************************** +// * D3DSurface_LockRect +// ****************************************************************** +OOVPA_NO_XREF(D3DSurface_LockRect, 3911, 16) + + // D3DSurface_LockRect+0x00 : mov eax, [esp+0x10] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x10 }, + + // D3DSurface_LockRect+0x04 : mov ecx, [esp+0x0C] + { 0x04, 0x8B }, + { 0x05, 0x4C }, + { 0x06, 0x24 }, + { 0x07, 0x0C }, + + // D3DSurface_LockRect+0x0C : push eax + { 0x0C, 0x50 }, + + // D3DSurface_LockRect+0x11 : push ecx; push edx; push 0; push 0 + { 0x11, 0x51 }, + { 0x12, 0x52 }, + { 0x13, 0x6A }, + { 0x15, 0x6A }, + + // D3DSurface_LockRect+0x18 : call [abs] + { 0x18, 0xE8 }, + + // D3DSurface_LockRect+0x11 : retn 0x10 + { 0x1D, 0xC2 }, + { 0x1E, 0x10 }, +OOVPA_END; + +// ****************************************************************** +// * D3DPalette_Lock +// ****************************************************************** +OOVPA_NO_XREF(D3DPalette_Lock, 3911, 13) + + // D3DPalette_Lock+0x00 : test [esp+0x0C], 0xA0 + { 0x00, 0xF6 }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x0C }, + { 0x04, 0xA0 }, + + // D3DPalette_Lock+0x0A : jnz +0x06 + { 0x0A, 0x75 }, + { 0x0B, 0x06 }, + + // D3DPalette_Lock+0x18 : mov ecx, [esp+0x0C] + { 0x18, 0x8B }, + { 0x19, 0x4C }, + { 0x1A, 0x24 }, + { 0x1B, 0x0C }, + + // D3DPalette_Lock+0x1C : mov [ecx], eax + { 0x1C, 0x89 }, + { 0x1D, 0x01 }, +OOVPA_END; + +// ****************************************************************** +// * D3DTexture_LockRect +// ****************************************************************** +OOVPA_NO_XREF(D3DTexture_LockRect, 3911, 17) + + // D3DTexture_LockRect+0x00 : mov eax, [esp+0x14] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x14 }, + + // D3DTexture_LockRect+0x04 : mov ecx, [esp+0x10] + { 0x04, 0x8B }, + { 0x05, 0x4C }, + { 0x06, 0x24 }, + { 0x07, 0x10 }, + + // D3DTexture_LockRect+0x0C : push eax, push ecx, push edx, push eax, push 0 + { 0x0C, 0x50 }, + { 0x11, 0x51 }, + { 0x16, 0x52 }, + { 0x17, 0x50 }, + { 0x18, 0x6A }, + { 0x19, 0x00 }, + + // D3DTexture_LockRect+0x1B : call [addr] + { 0x1B, 0xE8 }, + + // D3DTexture_LockRect+0x20 : retn 0x14 + { 0x20, 0xC2 }, + { 0x21, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * D3DVolumeTexture_LockBox +// ****************************************************************** +OOVPA_NO_XREF(D3DVolumeTexture_LockBox, 3911, 11) + + // D3DVolumeTexture_LockBox+0x08 : test bl, 0x20 + { 0x08, 0xF6 }, + { 0x09, 0xC3 }, + { 0x0A, 0x20 }, + + // D3DVolumeTexture_LockBox+0x40 : test bl, 0x40 + { 0x40, 0xF6 }, + { 0x41, 0xC3 }, + { 0x42, 0x40 }, + + // D3DVolumeTexture_LockBox+0x83 : lea ecx, [eax+edx] + { 0x83, 0x8D }, + { 0x84, 0x0C }, + { 0x85, 0x10 }, + + // D3DVolumeTexture_LockBox+0x99 : retn 0x14 + { 0x99, 0xC2 }, + { 0x9A, 0x14 }, +OOVPA_END; + +// ****************************************************************** +// * D3DCubeTexture_LockRect +// ****************************************************************** +OOVPA_NO_XREF(D3DCubeTexture_LockRect, 3911, 11) + + // D3DCubeTexture_LockRect+0x06 : test bl, 0x20 + { 0x06, 0xF6 }, + { 0x07, 0xC3 }, + { 0x08, 0x20 }, + + // D3DCubeTexture_LockRect+0x3F : test bl, 0x40 + { 0x3F, 0xF6 }, + { 0x40, 0xC3 }, + { 0x41, 0x40 }, + + // D3DCubeTexture_LockRect+0x71 : shr edx, 0x03 + { 0x71, 0xC1 }, + { 0x72, 0xEA }, + { 0x73, 0x03 }, + + // D3DCubeTexture_LockRect+0x98 : retn 0x18 + { 0x98, 0xC2 }, + { 0x99, 0x18 }, +OOVPA_END; + +// ****************************************************************** +// * D3DTexture_GetSurfaceLevel +// ****************************************************************** +OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel, 3911, 11) + + // D3DTexture_GetSurfaceLevel+0x08 : lea [esp+0x14] + { 0x08, 0x8D }, + { 0x0B, 0x14 }, + + // D3DTexture_GetSurfaceLevel+0x17 : mov edx, [esp+0x24] + { 0x17, 0x8B }, + { 0x1A, 0x24 }, + + // D3DTexture_GetSurfaceLevel+0x20 : lea ecx, [esp+0x28] + { 0x23, 0x28 }, + + // D3DTexture_GetSurfaceLevel+0x24 : push ecx + { 0x24, 0x51 }, + + // D3DTexture_GetSurfaceLevel+0x25 : push edx + { 0x25, 0x52 }, + + // D3DTexture_GetSurfaceLevel+0x26 : push 0 + { 0x26, 0x6A }, + + // D3DTexture_GetSurfaceLevel+0x43 : call [abs] + { 0x43, 0xE8 }, + + // D3DTexture_GetSurfaceLevel+0x4C : retn 0x0C + { 0x4C, 0xC2 }, + { 0x4D, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * Lock2DSurface +// ****************************************************************** +OOVPA_NO_XREF(Lock2DSurface, 3911, 11) + + { 0x06, 0xF6 }, + { 0x07, 0xC3 }, + { 0x08, 0x20 }, + + { 0x3F, 0xF6 }, + { 0x40, 0xC3 }, + { 0x41, 0x40 }, + + { 0x71, 0xC1 }, + { 0x72, 0xEA }, + { 0x73, 0x03 }, + + { 0x98, 0xC2 }, + { 0x99, 0x18 }, +OOVPA_END; + +// ****************************************************************** +// * Get2DSurfaceDesc +// ****************************************************************** +OOVPA_NO_XREF(Get2DSurfaceDesc, 3911, 10) + + // Get2DSurfaceDesc+0x2B : movzx edx, byte ptr [edi+0x0D] + { 0x2B, 0x0F }, + { 0x2C, 0xB6 }, + { 0x2D, 0x57 }, + { 0x2E, 0x0D }, + + // Get2DSurfaceDesc+0x56 : cmp eax, [edx+0x2154] + { 0x56, 0x3B }, + { 0x57, 0x82 }, + { 0x58, 0x54 }, + { 0x59, 0x21 }, + + // Get2DSurfaceDesc+0xAE : retn 0x0C + { 0xAE, 0xC2 }, + { 0xAF, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderSize +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderSize, 3911, 12) + + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x08 }, + + { 0x08, 0x8B }, + { 0x09, 0x4C }, + { 0x0A, 0x24 }, + { 0x0B, 0x04 }, + + { 0x0C, 0x8B }, + { 0x0D, 0x51 }, +// { 0x0E, 0x07 }, 0F vs 07 + + { 0x11, 0xC2 }, + { 0x12, 0x08 }, +/* + { 0x01, 0x44 }, + { 0x04, 0x85 }, + { 0x07, 0x09 }, + { 0x0A, 0x24 }, + { 0x0D, 0x51 }, + { 0x10, 0x10 }, + { 0x13, 0x00 },*/ +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetGammaRamp +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetGammaRamp, 3911, 9) + + // D3DDevice_SetGammaRamp+0x11 : and eax, 1; push ebx + { 0x11, 0x83 }, + { 0x12, 0xE0 }, + { 0x13, 0x01 }, + { 0x14, 0x53 }, + + // D3DDevice_SetGammaRamp+0x2F : rep movsd + { 0x2F, 0xF3 }, + { 0x30, 0xA5 }, + + // D3DDevice_SetGammaRamp+0x3E : push ebx; mov ecx, edx + { 0x3E, 0x53 }, + { 0x3F, 0x8B }, + { 0x40, 0xCA }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetMaterial +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetMaterial, 3911, 11) + + // D3DDevice_SetMaterial+0x0B : lea edi, [eax+0xB18] + { 0x0B, 0x8D }, + { 0x0C, 0xB8 }, + { 0x0D, 0x18 }, + { 0x0E, 0x0B }, + + // D3DDevice_SetMaterial+0x11 : mov ecx, 0x11 + { 0x11, 0xB9 }, + { 0x12, 0x11 }, + + // D3DDevice_SetMaterial+0x1C : or ecx, 0x20 + { 0x1B, 0x83 }, + { 0x1C, 0xC9 }, + { 0x1D, 0x20 }, + + // D3DDevice_SetMaterial+0x23 : retn 0x04 + { 0x23, 0xC2 }, + { 0x24, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_AddRef +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_AddRef, 3911, 10) + + // D3DDevice_AddRef+0x00 : mov eax, [addr] + { 0x00, 0xA1 }, + + // D3DDevice_AddRef+0x05 : mov ecx, [eax+0x0408] + { 0x05, 0x8B }, + { 0x06, 0x88 }, + { 0x07, 0x08 }, + { 0x08, 0x04 }, + + // D3DDevice_AddRef+0x0B : inc ecx + { 0x0B, 0x41 }, + + // D3DDevice_AddRef+0x05 : mov [eax+0x0408], ecx + { 0x0C, 0x89 }, + { 0x0D, 0x88 }, + { 0x0E, 0x08 }, + { 0x0F, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetViewport +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetViewport, 3911, 10) + + // D3DDevice_GetViewport+0x05 : push esi; push edi + { 0x05, 0x56 }, + { 0x06, 0x57 }, + + // D3DDevice_GetViewport+0x0B : lea esi, [eax+0x0B00] + { 0x0B, 0x8D }, + { 0x0C, 0xB0 }, + { 0x0D, 0x00 }, + { 0x0E, 0x0B }, + + // D3DDevice_GetViewport+0x11 : mov ecx, 6 + { 0x11, 0xB9 }, + { 0x12, 0x06 }, + + // D3DDevice_GetViewport+0x1A : retn 0x04 + { 0x1A, 0xC2 }, + { 0x1B, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetDisplayFieldStatus +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus, 3911, 14) + + // D3DDevice_GetDisplayFieldStatus+0x05 : mov edx, [eax+0x2B28] + { 0x05, 0x8B }, + { 0x06, 0x90 }, + { 0x07, 0x28 }, + { 0x08, 0x2B }, + + // D3DDevice_GetDisplayFieldStatus+0x12 : test [eax+0x2510], 0x1200000 + { 0x12, 0xF7 }, + { 0x13, 0x80 }, + { 0x14, 0x10 }, + { 0x15, 0x25 }, + + // D3DDevice_GetDisplayFieldStatus+0x1E : mov dx, 0x80C0 + { 0x1E, 0x66 }, + { 0x1F, 0xBA }, + { 0x20, 0xC0 }, + { 0x21, 0x80 }, + + // D3DDevice_GetDisplayFieldStatus+0x3C : retn 4 + { 0x3C, 0xC2 }, + { 0x3D, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_MultiSampleAntiAlias +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3911, 7) + + { 0x0B, 0x8B }, + { 0x1D, 0x8B }, + { 0x26, 0x8B }, + { 0x2C, 0x8B }, + { 0x38, 0x0B }, + { 0x40, 0x89 }, + { 0x49, 0xC2 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_VertexBlend +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend, 3911, 13) + + // D3DDevice_SetRenderState_VertexBlend+0x0A : or ecx, 2 + { 0x0A, 0x83 }, + { 0x0B, 0xC9 }, + { 0x0C, 0x02 }, + + // D3DDevice_SetRenderState_VertexBlend+0x1A : mov dword ptr [eax], 0x40328 + { 0x1A, 0xC7 }, + { 0x1B, 0x00 }, + { 0x1C, 0x28 }, + { 0x1D, 0x03 }, + { 0x1E, 0x04 }, + + // D3DDevice_SetRenderState_VertexBlend+0x23 : add eax, 8 + { 0x23, 0x83 }, + { 0x24, 0xC0 }, + { 0x25, 0x08 }, + + // D3DDevice_SetRenderState_VertexBlend+0x2F : retn 0x04 + { 0x2F, 0xC2 }, + { 0x30, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_BackFillMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode, 3911, 12) + + // D3DDevice_SetRenderState_BackFillMode+0x2B : jnz +0x2 + { 0x2B, 0x75 }, + { 0x2C, 0x02 }, + + // D3DDevice_SetRenderState_BackFillMode+0x32 : mov dword ptr [eax], abs + { 0x32, 0xC7 }, + { 0x33, 0x00 }, + + // D3DDevice_SetRenderState_BackFillMode+0x3B : add eax, 0x0C; mov [edi], eax; pop edi + { 0x3B, 0x83 }, + { 0x3C, 0xC0 }, + { 0x3D, 0x0C }, + { 0x3E, 0x89 }, + { 0x3F, 0x07 }, + { 0x40, 0x5F }, + + // D3DDevice_SetRenderState_BackFillMode+0x48 : retn 0x04 + { 0x48, 0xC2 }, + { 0x49, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_TwoSidedLighting +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_TwoSidedLighting, 3911, 13) + + // D3DDevice_SetRenderState_TwoSidedLighting+0x06 : or dword ptr [eax+8], 0x20 + { 0x06, 0x83 }, + { 0x07, 0x48 }, + { 0x08, 0x08 }, + { 0x09, 0x20 }, + + // D3DDevice_SetRenderState_TwoSidedLighting+0x3B : mov dword ptr [eax], 0x8038C + { 0x3B, 0xC7 }, + { 0x3C, 0x00 }, + { 0x3D, 0x8C }, + { 0x3E, 0x03 }, + + // D3DDevice_SetRenderState_TwoSidedLighting+0x44 : add eax, 0x0C + { 0x44, 0x83 }, + { 0x45, 0xC0 }, + { 0x46, 0x0C }, + + // D3DDevice_SetRenderState_TwoSidedLighting+0x51 : retn 0x04 + { 0x51, 0xC2 }, + { 0x52, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_NormalizeNormals +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals, 3911, 8) + + // D3DDevice_SetRenderState_NormalizeNormals+0x1D : mov [esi], eax + { 0x1D, 0x89 }, + { 0x1E, 0x06 }, + + // D3DDevice_SetRenderState_NormalizeNormals+0x1F : or dword ptr [esi+8], 2 + { 0x1F, 0x83 }, + { 0x20, 0x4E }, + { 0x21, 0x08 }, + { 0x22, 0x02 }, + + // D3DDevice_SetRenderState_NormalizeNormals+0x2A : retn 0x04 + { 0x2A, 0xC2 }, + { 0x2B, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_FrontFace +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_FrontFace, 3911, 9) + + // D3DDevice_SetRenderState_FrontFace+0x00 : push esi + { 0x00, 0x56 }, + + // D3DDevice_SetRenderState_FrontFace+0x07 : push esi + { 0x07, 0x56 }, + + // D3DDevice_SetRenderState_FrontFace+0xD : mov ecx, [esp+0x08] + { 0x0D, 0x8B }, + { 0x0E, 0x4C }, + { 0x0F, 0x24 }, + { 0x10, 0x08 }, + + // D3DDevice_SetRenderState_FrontFace+0x1A : add eax, 8 + { 0x1A, 0x83 }, + { 0x1B, 0xC0 }, + { 0x1C, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_TextureFactor +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor, 3911, 10) + + // D3DDevice_SetRenderState_TextureFactor+0x07 : mov eax, [esi+0x0414] + { 0x07, 0x8B }, + { 0x08, 0x86 }, + { 0x09, 0x14 }, + { 0x0A, 0x04 }, + + // D3DDevice_SetRenderState_TextureFactor+0x2E : rep stosd + { 0x2E, 0xF3 }, + { 0x2F, 0xAB }, + + // D3DDevice_SetRenderState_TextureFactor+0x3C : retn 0x04 + { 0x3C, 0xC2 }, + { 0x3D, 0x04 }, + + // D3DDevice_SetRenderState_TextureFactor+0x49 : retn 0x04 + { 0x49, 0xC2 }, + { 0x4A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_LogicOp +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp, 3911, 9) + + // D3DDevice_SetRenderState_LogicOp+0x11 : test ecx, ecx + { 0x11, 0x85 }, + { 0x12, 0xC9 }, + + // D3DDevice_SetRenderState_LogicOp+0x2D : mov dword ptr [eax], 0x817BC + { 0x2D, 0xC7 }, + { 0x2E, 0x00 }, + { 0x2F, 0xBC }, + { 0x30, 0x17 }, + { 0x31, 0x08 }, + + // D3DDevice_SetRenderState_LogicOp+0x49 : retn 0x04 + { 0x49, 0xC2 }, + { 0x4A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_EdgeAntiAlias +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias, 3911, 11) + + // D3DDevice_SetRenderState_EdgeAntiAlias+0x17 : mov [eax+0x04], ecx + { 0x17, 0x89 }, + { 0x18, 0x48 }, + { 0x19, 0x04 }, + + // D3DDevice_SetRenderState_EdgeAntiAlias+0x1A : mov [eax+0x08], ecx + { 0x1A, 0x89 }, + { 0x1B, 0x48 }, + { 0x1C, 0x08 }, + + // D3DDevice_SetRenderState_EdgeAntiAlias+0x1D : add eax, 0x0C + { 0x1D, 0x83 }, + { 0x1E, 0xC0 }, + { 0x1F, 0x0C }, + + // D3DDevice_SetRenderState_EdgeAntiAlias+0x29 : retn 0x04 + { 0x29, 0xC2 }, + { 0x2A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_MultiSampleMask +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask, 3911, 13) + + // D3DDevice_SetRenderState_MultiSampleMask+0x0B : mov ecx, esi + { 0x0B, 0x8B }, + { 0x0C, 0xCE }, + + // D3DDevice_SetRenderState_MultiSampleMask+0x32 : and ecx, 0x0F; shl edx, 0x10 + { 0x32, 0x83 }, + { 0x33, 0xE1 }, + { 0x34, 0x0F }, + { 0x35, 0xC1 }, + + // D3DDevice_SetRenderState_MultiSampleMask+0x3A : mov dword ptr [eax], 0x41D7C + { 0x3A, 0xC7 }, + { 0x3B, 0x00 }, + { 0x3C, 0x7C }, + { 0x3D, 0x1D }, + { 0x3E, 0x04 }, + + // D3DDevice_SetRenderState_MultiSampleMask+0x49 : retn 0x04 + { 0x49, 0xC2 }, + { 0x4A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_PersistDisplay +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_PersistDisplay, 3911, 14) + + // D3DDevice_PersistDisplay+0x25 : mov eax, [ebx+0x408] + { 0x25, 0x8B }, + { 0x26, 0x83 }, + { 0x27, 0x08 }, + { 0x28, 0x04 }, + { 0x29, 0x00 }, + { 0x2A, 0x00 }, + + // D3DDevice_PersistDisplay+0x3A : lea edi, [ebx+0x2308] + { 0x3a, 0x8D }, + { 0x3B, 0xBB }, + { 0x3C, 0x08 }, + { 0x3D, 0x23 }, + { 0x3E, 0x00 }, + { 0x3F, 0x00 }, + + // D3DDevice_PersistDisplay+0x70 : shl edx, cl + { 0x70, 0xD3 }, + { 0x71, 0xE2 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_ShadowFunc +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc, 3911, 14) + + // D3DDevice_SetRenderState_ShadowFunc+0x00 : push esi + { 0x00, 0x56 }, + + // D3DDevice_SetRenderState_ShadowFunc+0x11 : mov dword ptr [eax], 0x41E6C + { 0x11, 0xC7 }, + { 0x12, 0x00 }, + { 0x13, 0x6C }, + { 0x14, 0x1E }, + { 0x15, 0x04 }, + { 0x16, 0x00 }, + + // D3DDevice_SetRenderState_ShadowFunc+0x17 : lea edx, [ecx-0x0200] + { 0x17, 0x8D }, + { 0x18, 0x91 }, + { 0x19, 0x00 }, + { 0x1A, 0xFE }, + + // D3DDevice_SetRenderState_ShadowFunc+0x20 : add eax, 0x08 + { 0x20, 0x83 }, + { 0x21, 0xC0 }, + { 0x22, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_LineWidth +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth, 3911, 10) + + // D3DDevice_SetRenderState_LineWidth+0x15 : fmul dword ptr [esi+0x508] + { 0x15, 0xD8 }, + { 0x16, 0x8E }, + { 0x17, 0x08 }, + { 0x18, 0x05 }, + + // D3DDevice_SetRenderState_LineWidth+0x32 : cmp edi, 0x1FF + { 0x32, 0x81 }, + { 0x33, 0xFF }, + + // D3DDevice_SetRenderState_LineWidth+0x3A : mov edi, 0x1FF + { 0x3A, 0xBF }, + { 0x3B, 0xFF }, + + // D3DDevice_SetRenderState_LineWidth+0x5C : retn 0x04 + { 0x5C, 0xC2 }, + { 0x5D, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_YuvEnable +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable, 3911, 10) + + // D3DDevice_SetRenderState_YuvEnable+0x00 : mov eax, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // D3DDevice_SetRenderState_YuvEnable+0x04 : push edi + { 0x04, 0x56 }, + + // D3DDevice_SetRenderState_YuvEnable+0x0B : push edi + { 0x0B, 0x56 }, + + // D3DDevice_SetRenderState_YuvEnable+0x1F : mov [esi], eax + { 0x1F, 0x89 }, + { 0x20, 0x06 }, + + // D3DDevice_SetRenderState_YuvEnable+0x22 : retn 0x04 + { 0x22, 0xC2 }, + { 0x23, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_OcclusionCullEnable +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_OcclusionCullEnable, 3911, 12) + + // D3DDevice_SetRenderState_OcclusionCullEnable+0x20 : jz +0x05 + { 0x20, 0x74 }, + { 0x21, 0x05 }, + + // D3DDevice_SetRenderState_OcclusionCullEnable+0x3B : cmp [abs], 0x1E00 + { 0x3B, 0x81 }, + { 0x41, 0x00 }, + { 0x42, 0x1E }, + + // D3DDevice_SetRenderState_OcclusionCullEnable+0x4A : mov dword ptr [eax], 0x41D84 + { 0x4A, 0xC7 }, + { 0x4B, 0x00 }, + { 0x4C, 0x84 }, + { 0x4D, 0x1D }, + { 0x4E, 0x04 }, + + // D3DDevice_SetRenderState_OcclusionCullEnable+0x59 : retn 0x04 + { 0x59, 0xC2 }, + { 0x5A, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_StencilCullEnable +// ****************************************************************** +OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3911, 8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x0D, XREF_D3DRS_STENCILCULLENABLE ), + + { 0x0B, 0x56 }, + { 0x16, 0x8B }, + { 0x22, 0xB9 }, + { 0x2E, 0xD2 }, + { 0x3A, 0x0C }, + { 0x46, 0x03 }, + { 0x52, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DrawVerticesUP +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 3911, 8) + + { 0x1F, 0x8B }, + { 0x3E, 0xC0 }, + { 0x5E, 0x03 }, + { 0x7E, 0x07 }, + { 0x9E, 0xF0 }, + { 0xBE, 0x40 }, + { 0xDE, 0x75 }, + { 0xFE, 0x8B }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DrawIndexedVerticesUP +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP, 3911, 8) + + { 0x1F, 0x8B }, + { 0x3E, 0x8B }, + { 0x5E, 0xF0 }, + { 0x7E, 0x8B }, + { 0xA2, 0x8B }, + { 0xBE, 0x83 }, + { 0xDE, 0x75 }, + { 0xFE, 0x75 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DrawVertices +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DrawVertices, 3911, 8) + + { 0x12, 0x8B }, + { 0x27, 0x8B }, + { 0x3A, 0x89 }, + { 0x4E, 0xFF }, + { 0x62, 0x81 }, + { 0x76, 0x00 }, + { 0x8A, 0x17 }, + { 0x9E, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetDisplayMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetDisplayMode, 3911, 7) + + { 0x09, 0xB4 }, + { 0x14, 0x8B }, + { 0x1F, 0x10 }, + { 0x2A, 0x1B }, + { 0x35, 0x8B }, + { 0x41, 0x89 }, + { 0x4B, 0x89 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetTextureState_BumpEnv +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv, 3911, 7) + + { 0x0E, 0x8B }, + { 0x16, 0x8B }, + { 0x22, 0x24 }, + { 0x2E, 0x24 }, + { 0x3A, 0x04 }, + { 0x46, 0x8B }, + { 0x52, 0xB5 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetTextureState_ColorKeyColor +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor, 3911, 7) + + { 0x07, 0x56 }, + { 0x0D, 0x8B }, + { 0x13, 0x8D }, + { 0x1A, 0x8B }, + { 0x21, 0x83 }, + { 0x28, 0x07 }, + { 0x2F, 0x5E }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexData4s +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexData4s, 3911, 8) + + { 0x07, 0x56 }, + { 0x10, 0x08 }, + { 0x19, 0xBF }, + { 0x22, 0x24 }, + { 0x2B, 0x54 }, + { 0x34, 0x24 }, + { 0x3D, 0x08 }, + { 0x46, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_GetType +// ****************************************************************** +OOVPA_NO_XREF(D3DResource_GetType, 3911, 7) + + { 0x13, 0x2A }, + { 0x28, 0x00 }, + { 0x3D, 0x00 }, + { 0x52, 0x74 }, + { 0x67, 0x00 }, + { 0x7C, 0x04 }, + { 0x91, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3D_AllocContiguousMemory +// ****************************************************************** +OOVPA_NO_XREF(D3D_AllocContiguousMemory, 3911, 6) + + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x0A, 0x04 }, + { 0x0E, 0x6A }, + { 0x16, 0xC2 }, + { 0x17, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_Deferred +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetRenderState_Deferred, 3911, 9) + + // D3DDevice_SetRenderState_Deferred+0x00 : mov eax, ds:(g_DirtyFromRenderState)-148[ecx*4] + { 0x00, 0x8B }, + { 0x01, 0x04 }, + { 0x02, 0x8D }, + + // D3DDevice_SetRenderState_Deferred+0x07 : or dword ptr ds:g_Device+8,eax + { 0x07, 0x09 }, + { 0x08, 0x05 }, + + // D3DDevice_SetRenderState_Deferred+0x0D : mov dword ptr ds:D3D__RenderState[ecx*4], edx + { 0x0D, 0x89 }, + { 0x0E, 0x14 }, + { 0x0F, 0x8D }, + + // D3DDevice_SetRenderState_Deferred+0x14 : retn + { 0x14, 0xC3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetLight +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetLight, 3911, 10) +// Based on Dxbx patterns for 3911, 4361, 4627, 5344, 5558, 5659, 5788, 5849, 5933 + + // D3DDevice_GetLight+0x0B : mov esi, [ecx+XXXh] + { 0x0B, 0x8B }, + { 0x0C, 0xB1 }, + { 0x0F, 0x00 }, + { 0x10, 0x00 }, + + // D3DDevice_GetLight+0x12 : mov edi, [esp+8+arg_4] + { 0x12, 0x8B }, + { 0x13, 0x7C }, + { 0x14, 0x24 }, + { 0x15, 0x10 }, + + // D3DDevice_GetLight+0x1F : mov ecx, 1Ah + { 0x1E, 0xB9 }, + { 0x1F, 0x1A }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetLight +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetLight, 3911, 8) + + { 0x1D, 0x0F }, + { 0x3C, 0xD8 }, + { 0x5B, 0x00 }, + { 0x7A, 0x89 }, + { 0x99, 0xA5 }, + { 0xB8, 0xC1 }, + { 0xD7, 0x00 }, + { 0xF6, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetProjectionViewportMatrix +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix, 3911, 7) + + { 0x02, 0x35 }, + { 0x07, 0x57 }, + { 0x0A, 0x24 }, + { 0x0E, 0xA0 }, + { 0x12, 0xB9 }, + { 0x16, 0x00 }, + { 0x1A, 0x5E }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetTile +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetTile, 3911, 7) + + { 0x03, 0x04 }, + { 0x0A, 0x56 }, + { 0x0D, 0x7C }, + { 0x12, 0x40 }, + { 0x17, 0x21 }, + { 0x1C, 0x00 }, + { 0x21, 0x5F }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_ApplyStateBlock +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_ApplyStateBlock, 3911, 8) + + { 0x1D, 0x83 }, + { 0x40, 0x83 }, + { 0x5B, 0x16 }, + { 0x7A, 0x01 }, + { 0x99, 0x46 }, + { 0xB8, 0x06 }, + { 0xD7, 0x39 }, + { 0xF6, 0x51 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CaptureStateBlock +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CaptureStateBlock, 3911, 7) + + { 0x1E, 0x76 }, + { 0x3E, 0xE8 }, + { 0x5E, 0x06 }, + { 0x7E, 0x26 }, + { 0x9E, 0xFF }, + { 0xBE, 0x04 }, + { 0xDE, 0xF8 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DeleteStateBlock +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DeleteStateBlock, 3911, 7) + + { 0x11, 0x76 }, + { 0x24, 0x3B }, + { 0x37, 0xE8 }, + { 0x4A, 0x50 }, + { 0x5D, 0x74 }, + { 0x70, 0x06 }, + { 0x83, 0xEB }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetBackMaterial +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetBackMaterial, 3911, 8) + + { 0x05, 0x56 }, + { 0x06, 0x57 }, + { 0x0A, 0x0C }, + { 0x0D, 0x5C }, + { 0x0E, 0x0B }, + { 0x12, 0x11 }, + { 0x16, 0xF3 }, + { 0x1A, 0xC2 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateStateBlock +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateStateBlock, 3911, 8) + + { 0x1E, 0x8B }, + { 0x3E, 0x89 }, + { 0x5E, 0x24 }, + { 0x7E, 0xF8 }, + { 0x9F, 0x01 }, + { 0xBE, 0xB6 }, + { 0xDE, 0xF8 }, + { 0xFE, 0x76 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DeletePixelShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DeletePixelShader, 3911, 7) + + { 0x02, 0x24 }, + { 0x06, 0x75 }, + { 0x0A, 0x04 }, + { 0x0E, 0x09 }, + { 0x12, 0x04 }, + { 0x18, 0xC2 }, + { 0x1A, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetPixelShaderProgram +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetPixelShaderProgram, 3911, 7) + + { 0x06, 0xA1 }, + { 0x0E, 0x88 }, + { 0x16, 0x00 }, + { 0x1E, 0x00 }, + { 0x26, 0x04 }, + { 0x32, 0xC7 }, + { 0x36, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3D_KickOffAndWaitForIdle +// ****************************************************************** +// * This is for the real D3D::KickOffAndWaitForIdle +// ****************************************************************** +OOVPA_XREF(D3D_KickOffAndWaitForIdle, 3911, 5, + + XREF_D3D_KickOffAndWaitForIdle, + XRefZero) + + { 0x05, 0x8B }, + { 0x06, 0x48 }, + { 0x07, 0x1C }, + { 0x0A, 0x51 }, + { 0x10, 0xC3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetModelView +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetModelView, 3911, 7) + + { 0x12, 0x08 }, + { 0x26, 0x53 }, + { 0x3A, 0x8B }, + { 0x4E, 0x80 }, + { 0x62, 0x00 }, + { 0x76, 0x00 }, + { 0x8A, 0x0C }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_FlushVertexCache +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_FlushVertexCache, 3911, 8) + + { 0x00, 0x56 }, + { 0x07, 0x56 }, + { 0x08, 0xE8 }, + { 0x0D, 0xC7 }, + { 0x0F, 0x10 }, + { 0x12, 0x00 }, + { 0x17, 0x00 }, + { 0x1C, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetScissors +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetScissors, 3911, 8) + + { 0x1D, 0x08 }, + { 0x3C, 0x24 }, + { 0x5F, 0x8B }, + { 0x7A, 0x83 }, + { 0x99, 0xE0 }, + { 0xBA, 0xD9 }, + { 0xD9, 0x8B }, + { 0xF6, 0xDB }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexShaderInput +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexShaderInput, 3911, 8) + + { 0x1E, 0x03 }, + { 0x3E, 0x8B }, + { 0x5E, 0xC7 }, + { 0x7E, 0xF8 }, + { 0x9E, 0xC6 }, + { 0xBE, 0x7F }, + { 0xDE, 0xCA }, + { 0xFE, 0x17 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_PrimeVertexCache +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_PrimeVertexCache, 3911, 8) + + { 0x0D, 0x00 }, + { 0x1C, 0x55 }, + { 0x2B, 0x00 }, + { 0x3A, 0x24 }, + { 0x49, 0xCB }, + { 0x58, 0x74 }, + { 0x67, 0x00 }, + { 0x76, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetVertexData4ub +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetVertexData4ub, 3911, 7) + + { 0x07, 0x56 }, + { 0x10, 0x08 }, + { 0x19, 0xC9 }, + { 0x22, 0x54 }, + { 0x2B, 0x14 }, + { 0x34, 0x24 }, + { 0x3D, 0xFC }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetPixelShaderConstant +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetPixelShaderConstant, 3911, 7) + + { 0x1E, 0x4C }, + { 0x3E, 0x11 }, + { 0x61, 0xDF }, + { 0x7E, 0xF6 }, + { 0x9E, 0x05 }, + { 0xC0, 0x51 }, + { 0xDE, 0xC4 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_InsertCallback +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_InsertCallback, 3911, 7) + + { 0x0D, 0x8B }, + { 0x18, 0x8B }, + { 0x25, 0x50 }, + { 0x32, 0x10 }, + { 0x3F, 0x00 }, + { 0x4C, 0x00 }, + { 0x59, 0x03 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_BeginPushBuffer +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_BeginPushBuffer, 3911, 7) + + { 0x0B, 0xCE }, + { 0x1B, 0x57 }, + { 0x25, 0x00 }, + { 0x32, 0x06 }, + { 0x3F, 0x03 }, + { 0x4C, 0x04 }, + { 0x59, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_EndPushBuffer +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_EndPushBuffer, 3911, 7) + + { 0x11, 0x8D }, + { 0x24, 0x8B }, + { 0x37, 0xFC }, + { 0x4A, 0xFF }, + { 0x5D, 0xF7 }, + { 0x70, 0x03 }, + { 0x83, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_RopZCmpAlwaysRead +// ****************************************************************** +OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, 9, + + XRefNoSaveIndex, + XRefOne) + + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ), + + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x09 : call [abs] + { 0x09, 0xE8 }, + + // D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x0E : retn 0x04 + { 0x0E, 0xC2 }, + { 0x0F, 0x04 }, + { 0x10, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_RopZRead +// ****************************************************************** +OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3911, 9, + + XRefNoSaveIndex, + XRefOne) + + // D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + XREF_ENTRY( 0x05, XREF_D3DRS_ROPZREAD ), + + // D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // D3DDevice_SetRenderState_RopZRead+0x09 : call [abs] + { 0x09, 0xE8 }, + + // D3DDevice_SetRenderState_RopZRead+0x0E : retn 0x04 + { 0x0E, 0xC2 }, + { 0x0F, 0x04 }, + { 0x10, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetRenderState_DoNotCullUncompressed +// ****************************************************************** +OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, 9, + + XRefNoSaveIndex, + XRefOne) + + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD] + XREF_ENTRY( 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED ), + + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04] + { 0x00, 0x8B }, + { 0x01, 0x44 }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x09 : call [abs] + { 0x09, 0xE8 }, + + // D3DDevice_SetRenderState_DoNotCullUncompressed+0x0E : retn 0x04 + { 0x0E, 0xC2 }, + { 0x0F, 0x04 }, + { 0x10, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * XMETAL_StartPush +// ****************************************************************** +OOVPA_NO_XREF(XMETAL_StartPush, 3911, 11) + + // XMETAL_StartPush+0x00 : mov ecx, [esp+0x4] + { 0x00, 0x8B }, + { 0x01, 0x4C }, + { 0x02, 0x24 }, + { 0x03, 0x04 }, + + // XMETAL_StartPush+0x04 : mov eax, [ecx] + { 0x04, 0x8B }, + { 0x05, 0x01 }, + + // XMETAL_StartPush+0x06 : cmp eax, [ecx+0x4] + { 0x06, 0x3B }, + { 0x07, 0x41 }, + { 0x08, 0x04 }, + + // XMETAL_StartPush+0x10 : retn 4 + { 0x10, 0xC2 }, + { 0x11, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3D::SetFence +// ****************************************************************** +OOVPA_XREF(D3D_SetFence, 3911, 11, + + XREF_D3D_SetFence, + XRefZero) + + // D3D::SetFence+0x0F : mov edi, [esi+0x1C] + { 0x0F, 0x8B }, + { 0x10, 0x7E }, + { 0x11, 0x1C }, + + // D3D::SetFence+0x3D : and ecx, 0x3F + { 0x3D, 0x83 }, + { 0x3E, 0xE1 }, + { 0x3F, 0x3F }, + + // D3D::SetFence+0x77 : mov [esi*ebp*4], edi + { 0x77, 0x89 }, + { 0x78, 0x3C }, + { 0x79, 0xAE }, + + // D3D::SetFence+0x96 : retn 4 + { 0x96, 0xC2 }, + { 0x97, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_InsertFence +// ****************************************************************** +OOVPA_XREF(D3DDevice_InsertFence, 3911, 5, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x03, XREF_D3D_SetFence ), + + { 0x00, 0x6A }, + { 0x01, 0x00 }, + { 0x02, 0xE8 }, + { 0x07, 0xC3 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_LoadVertexShaderProgram +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_LoadVertexShaderProgram, 3911, 7) + + { 0x0B, 0x2D }, + { 0x18, 0x10 }, + { 0x25, 0x00 }, + { 0x32, 0xA5 }, + { 0x3F, 0x8B }, + { 0x4C, 0x00 }, + { 0x59, 0xE8 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_DeleteVertexShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_DeleteVertexShader, 3911, 6) + + { 0x02, 0x24 }, + { 0x06, 0xFF }, + { 0x0A, 0x08 }, + { 0x0E, 0x44 }, + + // D3DDevice_DeleteVertexShader+0x16 : retn 4 + { 0x16, 0xC2 }, + { 0x17, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_BlockOnFence +// ****************************************************************** +OOVPA_XREF(D3DDevice_BlockOnFence, 3911, 8, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x08, XREF_D3D_BlockOnTime ), + + { 0x00, 0x8B }, + { 0x02, 0x24 }, + { 0x04, 0x6A }, + { 0x06, 0x50 }, + { 0x0C, 0xC2 }, + { 0x0D, 0x04 }, + { 0x0E, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_Reset +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_Reset, 3911, 7) + + { 0x15, 0x8B }, + { 0x2C, 0x8B }, + { 0x43, 0x8B }, + { 0x5A, 0x08 }, + { 0x74, 0x8B }, + { 0x88, 0x50 }, + { 0x9F, 0x03 }, +OOVPA_END; + +// ****************************************************************** +// * D3D_GetAdapterIdentifier +// ****************************************************************** +OOVPA_NO_XREF(D3D_GetAdapterIdentifier, 3911, 7) + + { 0x04, 0x85 }, + { 0x0A, 0x08 }, + { 0x10, 0x56 }, + { 0x16, 0xB9 }, + { 0x20, 0xF3 }, + { 0x22, 0x5F }, + { 0x28, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3D_GetDeviceCaps +// ****************************************************************** +OOVPA_NO_XREF(D3D_GetDeviceCaps, 3911, 7) + + { 0x04, 0x85 }, + { 0x0A, 0x08 }, + { 0x10, 0x83 }, + { 0x16, 0x08 }, + { 0x1C, 0xC2 }, + { 0x22, 0x0C }, + { 0x29, 0x33 }, +OOVPA_END; + +// ****************************************************************** +// * D3D::SetCommonDebugRegisters +// ****************************************************************** +OOVPA_NO_XREF(D3D_SetCommonDebugRegisters, 3911, 10) + + { 0x07, 0x8B }, + { 0x08, 0x96 }, + { 0x09, 0x44 }, + { 0x0A, 0x2B }, + { 0x31, 0x81 }, + { 0x32, 0xE2 }, + { 0x33, 0xFF }, + { 0x34, 0xFF }, + { 0x35, 0xEF }, + { 0x36, 0xE7 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CreateImageSurface +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CreateImageSurface, 3911, 7) + + { 0x02, 0x24 }, + { 0x06, 0x24 }, + { 0x0A, 0x24 }, + { 0x0E, 0x44 }, + { 0x12, 0x00 }, + { 0x16, 0xE8 }, + { 0x1B, 0xC2 }, +OOVPA_END; + +// ****************************************************************** +// * D3D::BlockOnTime +// ****************************************************************** +OOVPA_XREF(D3D_BlockOnTime, 3911, 10, + + XREF_D3D_BlockOnTime, + XRefZero) + + // D3D::BlockOnFence+0x00 : push ebp + { 0x00, 0x55 }, + + // D3D::BlockOnFence+0x0A : push edi + { 0x0A, 0x57 }, + + // D3D::BlockOnFence+0x4E : cmp eax, 0x8000 + { 0x4E, 0x3D }, + { 0x4F, 0x00 }, + { 0x50, 0x80 }, + { 0x51, 0x00 }, + + // D3D::BlockOnFence+0x6E : mov ebp, 0x40100 + { 0x6E, 0xBD }, + { 0x6F, 0x00 }, + { 0x70, 0x01 }, + { 0x71, 0x04 } +OOVPA_END; + +// ****************************************************************** +// * D3D::BlockOnResource +// ****************************************************************** +OOVPA_XREF(D3D_BlockOnResource, 3911, 9, + + XREF_D3D_BlockOnResource, + XRefZero) + + { 0x34, 0x8B }, // mov edx, [ecx+0x1C] + { 0x35, 0x51 }, + { 0x36, 0x1C }, + { 0x41, 0xC2 }, // retn 4 + { 0x42, 0x04 }, + { 0x43, 0x00 }, + { 0x7E, 0xC2 }, // retn 4 + { 0x7F, 0x04 }, + { 0x80, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DResource_BlockUntilNotBusy +// ****************************************************************** +OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3911, 2, + + XRefNoSaveIndex, + XRefOne) + + XREF_ENTRY( 0x01, XREF_D3D_BlockOnResource ), + + { 0x00, 0xE9 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetTile +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetTile, 3911, 9) + + // D3DDevice_SetTile+0x06 : sub esp, 0x18 + { 0x06, 0x83 }, + { 0x07, 0xEC }, + { 0x08, 0x18 }, + + // D3DDevice_SetTile+0x15 : cmp [esi+4], eax + { 0x15, 0x39 }, + { 0x16, 0x46 }, + { 0x17, 0x04 }, + + // D3DDevice_SetTile+0x7E : lea edi, [edx+ecx*8+21BCh] + { 0x7E, 0x83 }, + { 0x7F, 0xC4 }, + { 0x80, 0x18 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SetBackMaterial +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SetBackMaterial, 3911, 9) + + { 0x0A, 0x57 }, + { 0x0B, 0x8D }, + { 0x0C, 0xB8 }, + { 0x0D, 0x5C }, + { 0x0E, 0x0B }, + { 0x0F, 0x00 }, + { 0x14, 0x00 }, + { 0x18, 0x8B }, + { 0x1E, 0x5F }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_SwitchTexture +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_SwitchTexture, 3911, 10) + + // D3DDevice_SwitchTexture+0x00 : mov eax, [addr] + { 0x00, 0xA1 }, + + // D3DDevice_SwitchTexture+0x05 : add eax, 0x0C + { 0x05, 0x83 }, + { 0x06, 0xC0 }, + { 0x07, 0x0C }, + + // D3DDevice_SwitchTexture+0x08 : cmp eax, ds:dword_XXXXX + { 0x08, 0x3B }, + { 0x09, 0x05 }, + + // D3DDevice_SwitchTexture+0x0E : jnb +0x15 + { 0x0E, 0x73 }, + { 0x0F, 0x15 }, + + // D3DDevice_SwitchTexture+0x22 : retn 0x04 + { 0x22, 0xC2 }, + { 0x23, 0x04 }, + +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetModelView +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetModelView, 3911, 10) + + { 0x05, 0x57 }, + { 0x0A, 0x85 }, + { 0x10, 0xB0 }, + { 0x11, 0xE0 }, + { 0x12, 0x05 }, + { 0x13, 0x00 }, + { 0x14, 0x00 }, + { 0x15, 0xB9 }, + { 0x16, 0x10 }, + { 0x1C, 0x5E }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_CopyRects +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_CopyRects, 3911, 9) + + { 0x10, 0x0F }, + { 0x11, 0xB6 }, + { 0x12, 0x75 }, + { 0x13, 0x0D }, + { 0x14, 0x8A }, + { 0x15, 0x9E }, + { 0x40, 0xF6 }, + { 0x4F, 0x84 }, + { 0x75, 0x15 }, +OOVPA_END; + +// ****************************************************************** +// * D3DVertexBuffer_GetDesc +// ****************************************************************** +OOVPA_NO_XREF(D3DVertexBuffer_GetDesc, 3911, 7) + + { 0x02, 0x24 }, + { 0x06, 0x74 }, + { 0x0A, 0xC7 }, + { 0x0E, 0x00 }, + { 0x15, 0x89 }, + { 0x16, 0x46 }, + { 0x1A, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetShaderConstantMode +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetShaderConstantMode, 3911, 8) + + { 0x05, 0x8B }, + { 0x06, 0x88 }, + { 0x07, 0x40 }, + { 0x08, 0x21 }, + { 0x0B, 0x8B }, + { 0x0D, 0x24 }, + { 0x10, 0x0A }, + { 0x13, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShader, 3911, 7) + + { 0x05, 0x8B }, + { 0x06, 0x88 }, + { 0x07, 0x74 }, + { 0x0A, 0x00 }, + { 0x0D, 0x24 }, + { 0x10, 0x0A }, + { 0x13, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderConstant +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderConstant, 3911, 9) + + { 0x05, 0x8B }, + { 0x06, 0x74 }, + { 0x07, 0x24 }, + { 0x08, 0x08 }, + { 0x09, 0x57 }, + { 0x0A, 0x8B }, + { 0x0B, 0x3D }, + { 0x18, 0x00 }, + { 0x1F, 0xF7 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderInput +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderInput, 3911, 8) + + { 0x00, 0x8B }, + { 0x03, 0x08 }, + { 0x04, 0x85 }, + { 0x05, 0xC9 }, + { 0x06, 0xA1 }, + { 0x10, 0x07 }, + { 0x18, 0x04 }, + { 0x1F, 0x20 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_RunVertexStateShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_RunVertexStateShader, 3911, 9) + + { 0x0D, 0x8B }, + { 0x10, 0x0C }, + { 0x11, 0x85 }, + { 0x12, 0xC9 }, + { 0x13, 0x74 }, + { 0x14, 0x21 }, + { 0x15, 0xD9 }, + { 0x16, 0x41 }, + { 0x1F, 0x41 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderType +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderType, 3911, 7) + + { 0x04, 0x8B }, + { 0x0A, 0x07 }, + { 0x10, 0xEB }, + { 0x16, 0x00 }, + { 0x1C, 0x40 }, + { 0x22, 0xC9 }, + { 0x28, 0x08 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderDeclaration +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderDeclaration, 3911, 9) + + { 0x00F, 0x8B }, + { 0x010, 0x4C }, + { 0x011, 0x24 }, + { 0x012, 0x1C }, + { 0x013, 0xC7 }, + { 0x014, 0x01 }, + { 0x015, 0x00 }, + { 0x11F, 0x83 }, + { 0x129, 0x0F }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetVertexShaderFunction +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetVertexShaderFunction, 3911, 7) + + { 0x16, 0xC0 }, + { 0x2E, 0x01 }, + { 0x46, 0x10 }, + { 0x5E, 0x07 }, + { 0x76, 0xC7 }, + { 0x8E, 0x00 }, + { 0xA6, 0xF8 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetPixelShader +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetPixelShader, 3911, 7) + + { 0x05, 0x8B }, + { 0x06, 0x88 }, + { 0x07, 0x14 }, + { 0x0A, 0x00 }, + { 0x0D, 0x24 }, + { 0x10, 0x0A }, + { 0x13, 0x00 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_IsFencePending +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_IsFencePending, 3911, 11) + + { 0x05, 0x8B }, + { 0x06, 0x88 }, + { 0x07, 0xF0 }, + { 0x08, 0x03 }, + { 0x09, 0x00 }, + { 0x0A, 0x00 }, + { 0x0B, 0x8B }, + { 0x0C, 0x40 }, + { 0x0D, 0x1C }, + { 0x1A, 0x1B }, + { 0x1F, 0x04 }, +OOVPA_END; + +// ****************************************************************** +// * D3DDevice_GetPushBufferOffset +// ****************************************************************** +OOVPA_NO_XREF(D3DDevice_GetPushBufferOffset, 3911, 7) + + { 0x14, 0xB8 }, + { 0x2A, 0x8B }, + { 0x40, 0x47 }, + { 0x56, 0x89 }, + { 0x6C, 0xAB }, + { 0x82, 0x04 }, + { 0x98, 0x89 }, +OOVPA_END; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index b54a6e9b5..6c3519175 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -83,7 +83,7 @@ OOVPA_NO_XREF(Direct3D_CreateDevice, 3925, 8) { 0x91, 0x18 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_IsBusy // ****************************************************************** @@ -100,7 +100,8 @@ OOVPA_NO_XREF(D3DDevice_IsBusy, 3925, 8) { 0x33, 0xC3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetDeviceCaps // ****************************************************************** @@ -124,8 +125,8 @@ OOVPA_NO_XREF(D3DDevice_GetDeviceCaps, 3925, 11) { 0x14, 0xC2 }, { 0x15, 0x04 }, OOVPA_END; - - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_BeginVisibilityTest // ****************************************************************** @@ -148,8 +149,8 @@ OOVPA_NO_XREF(D3DDevice_BeginVisibilityTest, 3925, 11) { 0x1F, 0xC0 }, { 0x20, 0x0C }, OOVPA_END; - - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetMaterial // ****************************************************************** @@ -164,7 +165,8 @@ OOVPA_NO_XREF(D3DDevice_GetMaterial, 3925, 9) { 0x16, 0xF3 }, { 0x1A, 0xC2 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_EndVisibilityTest // ****************************************************************** @@ -189,7 +191,8 @@ OOVPA_NO_XREF(D3DDevice_EndVisibilityTest, 3925, 13) { 0x44, 0xC0 }, { 0x45, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVisibilityTestResult // ****************************************************************** @@ -211,7 +214,8 @@ OOVPA_NO_XREF(D3DDevice_GetVisibilityTestResult, 3925, 11) { 0x2E, 0x76 }, { 0x2F, 0x88 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D::CDevice::KickOff // ****************************************************************** @@ -230,7 +234,8 @@ OOVPA_NO_XREF(D3DDevice_KickOff, 3925, 10) { 0x91, 0xEA }, { 0x92, 0x02 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_LoadVertexShader // ****************************************************************** @@ -251,7 +256,8 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShader, 3925, 10) { 0x4E, 0x89 }, { 0x4F, 0x13 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SelectVertexShader // ****************************************************************** @@ -273,7 +279,8 @@ OOVPA_NO_XREF(D3DDevice_SelectVertexShader, 3925, 11) { 0x51, 0x89 }, { 0x52, 0x06 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_BlockUntilVerticalBlank // ****************************************************************** @@ -298,7 +305,8 @@ OOVPA_NO_XREF(D3DDevice_BlockUntilVerticalBlank, 3925, 14) { 0x18, 0xF0 }, { 0x19, 0x24 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVerticalBlankCallback // ****************************************************************** @@ -321,7 +329,8 @@ OOVPA_NO_XREF(D3DDevice_SetVerticalBlankCallback, 3925, 12) { 0x11, 0x04 }, { 0x12, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderTarget // ****************************************************************** @@ -345,6 +354,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3925, 11) // D3DDevice_SetRenderTarget+0xDC : push edx { 0xDC, 0x52 }, OOVPA_END; +#endif #if 0 // Moved to 3948 // ****************************************************************** // * D3DDevice_SetRenderTarget @@ -368,6 +378,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderTarget, 3948, 8) { 0xDA, 0x52 }, OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DSurface_GetDesc // ****************************************************************** @@ -403,7 +414,8 @@ OOVPA_NO_XREF(D3DSurface_GetDesc, 3925, 16) { 0x13, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetTransform // ****************************************************************** @@ -429,7 +441,8 @@ OOVPA_NO_XREF(D3DDevice_GetTransform, 3925, 12) { 0x20, 0xC2 }, { 0x21, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetStreamSource // ****************************************************************** @@ -452,7 +465,8 @@ OOVPA_NO_XREF(D3DDevice_SetStreamSource, 3925, 12) { 0x6C, 0x80 }, { 0x6D, 0x02 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexShader // ****************************************************************** @@ -479,7 +493,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShader, 3925, 14) { 0x8F, 0x94 }, { 0x90, 0x1E }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreatePixelShader // ****************************************************************** @@ -503,7 +518,8 @@ OOVPA_NO_XREF(D3DDevice_CreatePixelShader, 3925, 11) { 0x42, 0xC2 }, { 0x43, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetPixelShader // ****************************************************************** @@ -527,7 +543,8 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShader, 3925, 10) { 0xE4, 0xA5 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetIndices // ****************************************************************** @@ -549,7 +566,8 @@ OOVPA_NO_XREF(D3DDevice_SetIndices, 3925, 11) { 0x69, 0x7C }, { 0x6A, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetViewport // ****************************************************************** @@ -572,7 +590,8 @@ OOVPA_NO_XREF(D3DDevice_SetViewport, 3925, 10) // D3DDevice_SetViewport+0x9D : inc edx { 0x9D, 0x42 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTexture // ****************************************************************** @@ -595,6 +614,7 @@ OOVPA_NO_XREF(D3DDevice_SetTexture, 3925, 12) // Deprecated in favor of 3911 bel { 0x7D, 0xC2 }, { 0x7E, 0x08 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetTexture, named with 2 suffix to match EMUPATCH(D3DDevice_GetTexture2) @@ -755,6 +775,7 @@ OOVPA_NO_XREF(D3DDevice_DrawTriPatch, 3911, 27) // Also verified for 4361, 4627, { 0x1F, 0x24 }, OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DrawIndexedVertices // ****************************************************************** @@ -777,7 +798,8 @@ OOVPA_NO_XREF(D3DDevice_DrawIndexedVertices, 3925, 12) { 0xDA, 0x8D }, { 0xDB, 0x9B }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_Begin // ****************************************************************** @@ -799,7 +821,8 @@ OOVPA_NO_XREF(D3DDevice_Begin, 3925, 11) { 0x38, 0xC2 }, { 0x39, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexData2f // ****************************************************************** @@ -826,7 +849,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2f, 3925, 14) { 0x2E, 0xC2 }, { 0x2F, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexData2s // ****************************************************************** @@ -850,7 +874,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData2s, 3925, 11) { 0x32, 0xC2 }, { 0x33, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexData4f // ****************************************************************** @@ -872,7 +897,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4f, 3925, 11) { 0x50, 0xC2 }, { 0x51, 0x14 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexDataColor // ****************************************************************** @@ -904,7 +930,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexDataColor, 3925, 18) { 0x35, 0x00 }, { 0x36, 0xFF }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_End // ****************************************************************** @@ -929,7 +956,8 @@ OOVPA_NO_XREF(D3DDevice_End, 3925, 12) // D3DDevice_End+0x40 : retn { 0x40, 0xC3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_Clear // ****************************************************************** @@ -950,7 +978,8 @@ OOVPA_NO_XREF(D3DDevice_Clear, 3925, 10) { 0x5F, 0x33 }, { 0x60, 0xED }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreatePalette // ****************************************************************** @@ -975,7 +1004,8 @@ OOVPA_NO_XREF(D3DDevice_CreatePalette, 3925, 12) { 0x4F, 0xE6 }, { 0x50, 0x1E }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetPalette // ****************************************************************** @@ -998,7 +1028,8 @@ OOVPA_NO_XREF(D3DDevice_SetPalette, 3925, 12) { 0x7C, 0xC2 }, { 0x7D, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateTexture // ****************************************************************** @@ -1033,7 +1064,8 @@ OOVPA_NO_XREF(D3DDevice_CreateTexture, 3925, 14) { 0x29, 0xC2 }, { 0x2A, 0x1C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateVolumeTexture // ****************************************************************** @@ -1065,7 +1097,8 @@ OOVPA_NO_XREF(D3DDevice_CreateVolumeTexture, 3925, 15) { 0x2C, 0xC2 }, { 0x2D, 0x20 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateCubeTexture // ****************************************************************** @@ -1097,7 +1130,8 @@ OOVPA_NO_XREF(D3DDevice_CreateCubeTexture, 3925, 15) { 0x25, 0xC2 }, { 0x26, 0x18 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateIndexBuffer // ****************************************************************** @@ -1121,7 +1155,7 @@ OOVPA_NO_XREF(D3DDevice_CreateIndexBuffer, 3925, 13) { 0x32, 0x01 }, { 0x33, 0x01 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateVertexShader @@ -1209,6 +1243,7 @@ OOVPA_NO_XREF(D3DDevice_CreateVertexShader, 3925, 38) */ OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexShaderConstant // ****************************************************************** @@ -1231,7 +1266,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShaderConstant, 3925, 10) { 0x9B, 0xC2 }, { 0x9C, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetFlickerFilter // ****************************************************************** @@ -1254,7 +1290,8 @@ OOVPA_NO_XREF(D3DDevice_SetFlickerFilter, 3925, 12) { 0x1C, 0xC2 }, { 0x1D, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetSoftDisplayFilter // ****************************************************************** @@ -1277,7 +1314,7 @@ OOVPA_NO_XREF(D3DDevice_SetSoftDisplayFilter, 3925, 12) { 0x1C, 0xC2 }, { 0x1D, 0x04 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTextureState_TexCoordIndex @@ -1309,7 +1346,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 3925, 1+11, { 0x98, 0xE0 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTextureState_BorderColor // ****************************************************************** @@ -1335,7 +1372,8 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_BorderColor, 3925, 13) { 0x34, 0xC2 }, { 0x35, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_PSTextureModes // ****************************************************************** @@ -1357,7 +1395,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_PSTextureModes, 3925, 11) { 0x21, 0xC2 }, { 0x22, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_StencilFail // ****************************************************************** @@ -1380,7 +1419,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilFail, 3925, 12) { 0x4C, 0x04 }, { 0x4D, 0x00 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_CullMode @@ -1417,7 +1456,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3925, 2+15, { 0x50, 0x04 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_Simple // ****************************************************************** @@ -1445,7 +1484,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Simple, 3925, 13) { 0x2B, 0xEB }, { 0x2C, 0xD3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTransform // ****************************************************************** @@ -1468,7 +1508,8 @@ OOVPA_NO_XREF(D3DDevice_SetTransform, 3925, 10) { 0x7A, 0xDE }, { 0x7B, 0xF9 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_FogColor // ****************************************************************** @@ -1490,7 +1531,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_FogColor, 3925, 11) { 0x44, 0xC2 }, { 0x45, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_FillMode // ****************************************************************** @@ -1512,7 +1554,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_FillMode, 3925, 11) { 0x3B, 0xC2 }, { 0x3C, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_StencilEnable // ****************************************************************** @@ -1534,7 +1577,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_StencilEnable, 3925, 11) { 0x7D, 0xC2 }, { 0x7E, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_Dxt1NoiseEnable // ****************************************************************** @@ -1556,7 +1600,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Dxt1NoiseEnable, 3925, 11) { 0x74, 0xC2 }, { 0x75, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_ZBias // ****************************************************************** @@ -1579,7 +1624,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ZBias, 3925, 10) { 0x71, 0xC2 }, { 0x72, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_ZEnable // ****************************************************************** @@ -1605,7 +1651,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ZEnable, 3925, 13) { 0x69, 0xC2 }, { 0x6A, 0x04 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_Release @@ -1651,7 +1697,7 @@ OOVPA_NO_XREF(D3DDevice_Release, 3925, 11) { 0x2E, 0x48 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_Present // ****************************************************************** @@ -1674,7 +1720,8 @@ OOVPA_NO_XREF(D3DDevice_Present, 3925, 10) { 0xC0, 0x33 }, { 0xC1, 0xFF }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetShaderConstantMode // ****************************************************************** @@ -1698,7 +1745,8 @@ OOVPA_NO_XREF(D3DDevice_SetShaderConstantMode, 3925, 12) { 0xE6, 0x24 }, { 0xE7, 0x01 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetBackBuffer // ****************************************************************** @@ -1724,7 +1772,8 @@ OOVPA_NO_XREF(D3DDevice_GetBackBuffer, 3925, 12) { 0x31, 0xC2 }, { 0x32, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetRenderTarget // ****************************************************************** @@ -1747,6 +1796,7 @@ OOVPA_NO_XREF(D3DDevice_GetRenderTarget, 3925, 9) { 0x1D, 0xC2 }, { 0x1E, 0x04 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetDepthStencilSurface @@ -1803,6 +1853,7 @@ OOVPA_NO_XREF(D3DDevice_GetDepthStencilSurface, 3925, 10) { 0x26, 0x04 }, OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateVertexBuffer // ****************************************************************** @@ -1829,7 +1880,8 @@ OOVPA_NO_XREF(D3DDevice_CreateVertexBuffer, 3925, 13) { 0x53, 0xC2 }, { 0x54, 0x14 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DVertexBuffer_Lock // ****************************************************************** @@ -1854,7 +1906,8 @@ OOVPA_NO_XREF(D3DVertexBuffer_Lock, 3925, 11) { 0x4A, 0xC2 }, { 0x4B, 0x14 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_Register // ****************************************************************** @@ -1893,7 +1946,8 @@ OOVPA_NO_XREF(D3DResource_Register, 3925, 19) { 0x25, 0xC2 }, { 0x26, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_Release // ****************************************************************** @@ -1921,7 +1975,8 @@ OOVPA_NO_XREF(D3DResource_Release, 3925, 11) { 0x4B, 0xC2 }, { 0x4C, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_AddRef // ****************************************************************** @@ -1947,7 +2002,8 @@ OOVPA_NO_XREF(D3DResource_AddRef, 3925, 10) { 0x34, 0xC2 }, { 0x35, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_IsBusy // ****************************************************************** @@ -1972,7 +2028,8 @@ OOVPA_NO_XREF(D3DResource_IsBusy, 3925, 11) { 0x79, 0x73 }, { 0x7A, 0x09 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DSurface_LockRect // ****************************************************************** @@ -2006,7 +2063,8 @@ OOVPA_NO_XREF(D3DSurface_LockRect, 3925, 16) { 0x1D, 0xC2 }, { 0x1E, 0x10 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DPalette_Lock // ****************************************************************** @@ -2033,7 +2091,8 @@ OOVPA_NO_XREF(D3DPalette_Lock, 3925, 13) { 0x1C, 0x89 }, { 0x1D, 0x01 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DTexture_LockRect // ****************************************************************** @@ -2066,7 +2125,8 @@ OOVPA_NO_XREF(D3DTexture_LockRect, 3925, 17) { 0x20, 0xC2 }, { 0x21, 0x14 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DVolumeTexture_LockBox // ****************************************************************** @@ -2091,7 +2151,8 @@ OOVPA_NO_XREF(D3DVolumeTexture_LockBox, 3925, 11) { 0x99, 0xC2 }, { 0x9A, 0x14 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DCubeTexture_LockRect // ****************************************************************** @@ -2116,7 +2177,8 @@ OOVPA_NO_XREF(D3DCubeTexture_LockRect, 3925, 11) { 0x98, 0xC2 }, { 0x99, 0x18 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DTexture_GetSurfaceLevel // ****************************************************************** @@ -2149,7 +2211,8 @@ OOVPA_NO_XREF(D3DTexture_GetSurfaceLevel, 3925, 11) { 0x4C, 0xC2 }, { 0x4D, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * Lock2DSurface // ****************************************************************** @@ -2170,7 +2233,8 @@ OOVPA_NO_XREF(Lock2DSurface, 3925, 11) { 0x98, 0xC2 }, { 0x99, 0x18 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * Get2DSurfaceDesc // ****************************************************************** @@ -2192,7 +2256,8 @@ OOVPA_NO_XREF(Get2DSurfaceDesc, 3925, 10) { 0xAE, 0xC2 }, { 0xAF, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderSize // ****************************************************************** @@ -2223,7 +2288,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderSize, 3925, 12) { 0x10, 0x10 }, { 0x13, 0x00 },*/ OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetGammaRamp // ****************************************************************** @@ -2244,7 +2310,8 @@ OOVPA_NO_XREF(D3DDevice_SetGammaRamp, 3925, 9) { 0x3F, 0x8B }, { 0x40, 0xCA }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetMaterial // ****************************************************************** @@ -2269,7 +2336,8 @@ OOVPA_NO_XREF(D3DDevice_SetMaterial, 3925, 11) { 0x23, 0xC2 }, { 0x24, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_AddRef // ****************************************************************** @@ -2293,7 +2361,7 @@ OOVPA_NO_XREF(D3DDevice_AddRef, 3925, 10) { 0x0E, 0x08 }, { 0x0F, 0x04 }, OOVPA_END; - +#endif #if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3D_CMiniport_GetDisplayCapabilities // Was D3DDevice_Unknown1 @@ -2314,7 +2382,7 @@ OOVPA_NO_XREF(D3D_CMiniport_GetDisplayCapabilities, 3925, 9) { 0x1E, 0xC3 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetViewport // ****************************************************************** @@ -2338,7 +2406,7 @@ OOVPA_NO_XREF(D3DDevice_GetViewport, 3925, 10) { 0x1A, 0xC2 }, { 0x1B, 0x04 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetGammaRamp @@ -2377,6 +2445,7 @@ OOVPA_NO_XREF(D3DDevice_GetGammaRamp, 3925, 7) { 0x28, 0x04 }, OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetDisplayFieldStatus // ****************************************************************** @@ -2401,7 +2470,8 @@ OOVPA_NO_XREF(D3DDevice_GetDisplayFieldStatus, 3925, 14) { 0x3C, 0xC2 }, { 0x3D, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleAntiAlias // ****************************************************************** @@ -2415,7 +2485,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3925, 7) { 0x40, 0x89 }, { 0x49, 0xC2 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_VertexBlend // ****************************************************************** @@ -2442,7 +2513,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_VertexBlend, 3925, 13) { 0x2F, 0xC2 }, { 0x30, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_BackFillMode // ****************************************************************** @@ -2468,7 +2540,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_BackFillMode, 3925, 12) { 0x48, 0xC2 }, { 0x49, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_TwoSidedLighting // ****************************************************************** @@ -2495,7 +2568,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TwoSidedLighting, 3925, 13) { 0x51, 0xC2 }, { 0x52, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_NormalizeNormals // ****************************************************************** @@ -2515,7 +2589,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_NormalizeNormals, 3925, 8) { 0x2A, 0xC2 }, { 0x2B, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_FrontFace // ****************************************************************** @@ -2538,7 +2613,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_FrontFace, 3925, 9) { 0x1B, 0xC0 }, { 0x1C, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_TextureFactor // ****************************************************************** @@ -2562,7 +2638,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_TextureFactor, 3925, 10) { 0x49, 0xC2 }, { 0x4A, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_LogicOp // ****************************************************************** @@ -2583,7 +2660,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LogicOp, 3925, 9) { 0x49, 0xC2 }, { 0x4A, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_EdgeAntiAlias // ****************************************************************** @@ -2608,7 +2686,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_EdgeAntiAlias, 3925, 11) { 0x29, 0xC2 }, { 0x2A, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleMask // ****************************************************************** @@ -2635,6 +2714,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMask, 3925, 13) { 0x49, 0xC2 }, { 0x4A, 0x04 }, OOVPA_END; +#endif // ****************************************************************** // * D3DDevice_SetRenderState_MultiSampleMode @@ -2662,6 +2742,7 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_MultiSampleMode, 3925, 12) { 0x23, 0x04 }, OOVPA_END; +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_PersistDisplay // ****************************************************************** @@ -2685,7 +2766,8 @@ OOVPA_NO_XREF(D3DDevice_PersistDisplay, 3925, 14) { 0x70, 0xD3 }, { 0x71, 0xE2 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_ShadowFunc // ****************************************************************** @@ -2713,7 +2795,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_ShadowFunc, 3925, 14) { 0x21, 0xC0 }, { 0x22, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_LineWidth // ****************************************************************** @@ -2737,7 +2820,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_LineWidth, 3925, 10) { 0x5C, 0xC2 }, { 0x5D, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_YuvEnable // ****************************************************************** @@ -2763,7 +2847,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_YuvEnable, 3925, 10) { 0x22, 0xC2 }, { 0x23, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_OcclusionCullEnable // ****************************************************************** @@ -2789,7 +2874,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_OcclusionCullEnable, 3925, 12) { 0x59, 0xC2 }, { 0x5A, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_StencilCullEnable // ****************************************************************** @@ -2808,7 +2894,8 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3925, 8, { 0x46, 0x03 }, { 0x52, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DrawVerticesUP // ****************************************************************** @@ -2823,7 +2910,8 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 3925, 8) { 0xDE, 0x75 }, { 0xFE, 0x8B }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DrawIndexedVerticesUP // ****************************************************************** @@ -2838,7 +2926,8 @@ OOVPA_NO_XREF(D3DDevice_DrawIndexedVerticesUP, 3925, 8) { 0xDE, 0x75 }, { 0xFE, 0x75 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DrawVertices // ****************************************************************** @@ -2853,7 +2942,8 @@ OOVPA_NO_XREF(D3DDevice_DrawVertices, 3925, 8) { 0x8A, 0x17 }, { 0x9E, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetDisplayMode // ****************************************************************** @@ -2867,7 +2957,8 @@ OOVPA_NO_XREF(D3DDevice_GetDisplayMode, 3925, 7) { 0x41, 0x89 }, { 0x4B, 0x89 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTextureState_BumpEnv // ****************************************************************** @@ -2881,7 +2972,8 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_BumpEnv, 3925, 7) { 0x46, 0x8B }, { 0x52, 0xB5 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTextureState_ColorKeyColor // ****************************************************************** @@ -2895,7 +2987,8 @@ OOVPA_NO_XREF(D3DDevice_SetTextureState_ColorKeyColor, 3925, 7) { 0x28, 0x07 }, { 0x2F, 0x5E }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexData4s // ****************************************************************** @@ -2910,6 +3003,7 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4s, 3925, 8) { 0x3D, 0x08 }, { 0x46, 0x00 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3D_SetPushBufferSize @@ -2947,7 +3041,7 @@ OOVPA_NO_XREF(D3D_SetPushBufferSize, 3925, 7) { 0x14, 0x08 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_GetType // ****************************************************************** @@ -2961,7 +3055,8 @@ OOVPA_NO_XREF(D3DResource_GetType, 3925, 7) { 0x7C, 0x04 }, { 0x91, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D_AllocContiguousMemory // ****************************************************************** @@ -2974,7 +3069,8 @@ OOVPA_NO_XREF(D3D_AllocContiguousMemory, 3925, 6) { 0x16, 0xC2 }, { 0x17, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_Deferred // ****************************************************************** @@ -2994,7 +3090,8 @@ OOVPA_NO_XREF(D3DDevice_SetRenderState_Deferred, 3925, 9) // D3DDevice_SetRenderState_Deferred+0x14 : retn { 0x14, 0xC3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetLight // ****************************************************************** @@ -3017,7 +3114,8 @@ OOVPA_NO_XREF(D3DDevice_GetLight, 3925, 10) { 0x1E, 0xB9 }, { 0x1F, 0x1A }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetLight // ****************************************************************** @@ -3032,7 +3130,7 @@ OOVPA_NO_XREF(D3DDevice_SetLight, 3925, 8) { 0xD7, 0x00 }, { 0xF6, 0x00 }, OOVPA_END; - +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_LightEnable @@ -3134,7 +3232,7 @@ OOVPA_XREF(D3DDevice_GetLightEnable, 3911, 1+24, // valid upto at least 5233, ne { 0x1F, 0x74 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetProjectionViewportMatrix // ****************************************************************** @@ -3148,7 +3246,8 @@ OOVPA_NO_XREF(D3DDevice_GetProjectionViewportMatrix, 3925, 7) { 0x16, 0x00 }, { 0x1A, 0x5E }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetTile // ****************************************************************** @@ -3162,7 +3261,8 @@ OOVPA_NO_XREF(D3DDevice_GetTile, 3925, 7) { 0x1C, 0x00 }, { 0x21, 0x5F }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_ApplyStateBlock // ****************************************************************** @@ -3177,7 +3277,8 @@ OOVPA_NO_XREF(D3DDevice_ApplyStateBlock, 3925, 8) { 0xD7, 0x39 }, { 0xF6, 0x51 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CaptureStateBlock // ****************************************************************** @@ -3191,7 +3292,8 @@ OOVPA_NO_XREF(D3DDevice_CaptureStateBlock, 3925, 7) { 0xBE, 0x04 }, { 0xDE, 0xF8 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DeleteStateBlock // ****************************************************************** @@ -3205,7 +3307,8 @@ OOVPA_NO_XREF(D3DDevice_DeleteStateBlock, 3925, 7) { 0x70, 0x06 }, { 0x83, 0xEB }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetBackMaterial // ****************************************************************** @@ -3220,7 +3323,8 @@ OOVPA_NO_XREF(D3DDevice_GetBackMaterial, 3925, 8) { 0x16, 0xF3 }, { 0x1A, 0xC2 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateStateBlock // ****************************************************************** @@ -3235,7 +3339,8 @@ OOVPA_NO_XREF(D3DDevice_CreateStateBlock, 3925, 8) { 0xDE, 0xF8 }, { 0xFE, 0x76 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DeletePixelShader // ****************************************************************** @@ -3249,7 +3354,8 @@ OOVPA_NO_XREF(D3DDevice_DeletePixelShader, 3925, 7) { 0x18, 0xC2 }, { 0x1A, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetPixelShaderProgram // ****************************************************************** @@ -3263,7 +3369,8 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShaderProgram, 3925, 7) { 0x32, 0xC7 }, { 0x36, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D_KickOffAndWaitForIdle // ****************************************************************** @@ -3280,7 +3387,8 @@ OOVPA_XREF(D3D_KickOffAndWaitForIdle, 3925, 5, { 0x0A, 0x51 }, { 0x10, 0xC3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetModelView // ****************************************************************** @@ -3294,7 +3402,8 @@ OOVPA_NO_XREF(D3DDevice_SetModelView, 3925, 7) { 0x76, 0x00 }, { 0x8A, 0x0C }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_FlushVertexCache // ****************************************************************** @@ -3309,7 +3418,8 @@ OOVPA_NO_XREF(D3DDevice_FlushVertexCache, 3925, 8) { 0x17, 0x00 }, { 0x1C, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetScissors // ****************************************************************** @@ -3324,7 +3434,8 @@ OOVPA_NO_XREF(D3DDevice_SetScissors, 3925, 8) { 0xD9, 0x8B }, { 0xF6, 0xDB }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexShaderInput // ****************************************************************** @@ -3339,7 +3450,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexShaderInput, 3925, 8) { 0xDE, 0xCA }, { 0xFE, 0x17 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_PrimeVertexCache // ****************************************************************** @@ -3354,7 +3466,8 @@ OOVPA_NO_XREF(D3DDevice_PrimeVertexCache, 3925, 8) { 0x67, 0x00 }, { 0x76, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetVertexData4ub // ****************************************************************** @@ -3368,7 +3481,8 @@ OOVPA_NO_XREF(D3DDevice_SetVertexData4ub, 3925, 7) { 0x34, 0x24 }, { 0x3D, 0xFC }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetPixelShaderConstant // ****************************************************************** @@ -3382,7 +3496,8 @@ OOVPA_NO_XREF(D3DDevice_SetPixelShaderConstant, 3925, 7) { 0xC0, 0x51 }, { 0xDE, 0xC4 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_InsertCallback // ****************************************************************** @@ -3396,7 +3511,8 @@ OOVPA_NO_XREF(D3DDevice_InsertCallback, 3925, 7) { 0x4C, 0x00 }, { 0x59, 0x03 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_BeginPushBuffer // ****************************************************************** @@ -3410,7 +3526,8 @@ OOVPA_NO_XREF(D3DDevice_BeginPushBuffer, 3925, 7) { 0x4C, 0x04 }, { 0x59, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_EndPushBuffer // ****************************************************************** @@ -3424,7 +3541,8 @@ OOVPA_NO_XREF(D3DDevice_EndPushBuffer, 3925, 7) { 0x70, 0x03 }, { 0x83, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_RopZCmpAlwaysRead // ****************************************************************** @@ -3450,7 +3568,8 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, 9, { 0x0F, 0x04 }, { 0x10, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_RopZRead // ****************************************************************** @@ -3476,7 +3595,8 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3925, 9, { 0x0F, 0x04 }, { 0x10, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetRenderState_DoNotCullUncompressed // ****************************************************************** @@ -3502,7 +3622,8 @@ OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 9, { 0x0F, 0x04 }, { 0x10, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * XMETAL_StartPush // ****************************************************************** @@ -3527,7 +3648,8 @@ OOVPA_NO_XREF(XMETAL_StartPush, 3925, 11) { 0x10, 0xC2 }, { 0x11, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D::SetFence // ****************************************************************** @@ -3555,7 +3677,8 @@ OOVPA_XREF(D3D_SetFence, 3925, 11, { 0x96, 0xC2 }, { 0x97, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_InsertFence // ****************************************************************** @@ -3571,7 +3694,8 @@ OOVPA_XREF(D3DDevice_InsertFence, 3925, 5, { 0x02, 0xE8 }, { 0x07, 0xC3 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_LoadVertexShaderProgram // ****************************************************************** @@ -3585,7 +3709,8 @@ OOVPA_NO_XREF(D3DDevice_LoadVertexShaderProgram, 3925, 7) { 0x4C, 0x00 }, { 0x59, 0xE8 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_DeleteVertexShader // ****************************************************************** @@ -3600,7 +3725,7 @@ OOVPA_NO_XREF(D3DDevice_DeleteVertexShader, 3925, 6) { 0x16, 0xC2 }, { 0x17, 0x04 }, OOVPA_END; - +#endif #if 0 // No longer used, replaced by generic 3911 version // ****************************************************************** // * D3DDevice_RunPushBuffer @@ -3629,7 +3754,7 @@ OOVPA_NO_XREF(D3DDevice_RunPushBuffer, 3925, 15) { 0xF7, 0x00 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_BlockOnFence // ****************************************************************** @@ -3648,6 +3773,7 @@ OOVPA_XREF(D3DDevice_BlockOnFence, 3925, 8, { 0x0D, 0x04 }, { 0x0E, 0x00 }, OOVPA_END; +#endif // ****************************************************************** // * D3D_EnumAdapterModes @@ -3679,6 +3805,7 @@ OOVPA_NO_XREF(D3D_GetAdapterModeCount, 3925, 8) { 0x9E, 0x00 }, OOVPA_END; +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_Reset // ****************************************************************** @@ -3692,7 +3819,8 @@ OOVPA_NO_XREF(D3DDevice_Reset, 3925, 7) { 0x88, 0x50 }, { 0x9F, 0x03 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D_GetAdapterIdentifier // ****************************************************************** @@ -3706,7 +3834,8 @@ OOVPA_NO_XREF(D3D_GetAdapterIdentifier, 3925, 7) { 0x22, 0x5F }, { 0x28, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D_GetDeviceCaps // ****************************************************************** @@ -3720,7 +3849,8 @@ OOVPA_NO_XREF(D3D_GetDeviceCaps, 3925, 7) { 0x22, 0x0C }, { 0x29, 0x33 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D::SetCommonDebugRegisters // ****************************************************************** @@ -3737,7 +3867,8 @@ OOVPA_NO_XREF(D3D_SetCommonDebugRegisters, 3925, 10) { 0x35, 0xEF }, { 0x36, 0xE7 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CreateImageSurface // ****************************************************************** @@ -3751,7 +3882,8 @@ OOVPA_NO_XREF(D3DDevice_CreateImageSurface, 3925, 7) { 0x16, 0xE8 }, { 0x1B, 0xC2 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D::BlockOnTime // ****************************************************************** @@ -3778,7 +3910,8 @@ OOVPA_XREF(D3D_BlockOnTime, 3925, 10, { 0x70, 0x01 }, { 0x71, 0x04 } OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3D::BlockOnResource // ****************************************************************** @@ -3797,7 +3930,8 @@ OOVPA_XREF(D3D_BlockOnResource, 3925, 9, { 0x7F, 0x04 }, { 0x80, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DResource_BlockUntilNotBusy // ****************************************************************** @@ -3810,6 +3944,7 @@ OOVPA_XREF(D3DResource_BlockUntilNotBusy, 3925, 2, { 0x00, 0xE9 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3D_ClearStateBlockFlags @@ -3941,7 +4076,7 @@ OOVPA_NO_XREF(D3DDevice_EndStateBlock, 3925, 6) { 0x09, 0xE9 }, OOVPA_END; #endif - +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetTile // ****************************************************************** @@ -3962,7 +4097,8 @@ OOVPA_NO_XREF(D3DDevice_SetTile, 3925, 9) { 0x7F, 0xC4 }, { 0x80, 0x18 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SetBackMaterial // ****************************************************************** @@ -3978,7 +4114,8 @@ OOVPA_NO_XREF(D3DDevice_SetBackMaterial, 3925, 9) { 0x18, 0x8B }, { 0x1E, 0x5F }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_SwitchTexture // ****************************************************************** @@ -4005,7 +4142,8 @@ OOVPA_NO_XREF(D3DDevice_SwitchTexture, 3925, 10) { 0x23, 0x04 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetModelView // ****************************************************************** @@ -4022,7 +4160,8 @@ OOVPA_NO_XREF(D3DDevice_GetModelView, 3925, 10) { 0x16, 0x10 }, { 0x1C, 0x5E }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_CopyRects // ****************************************************************** @@ -4038,7 +4177,8 @@ OOVPA_NO_XREF(D3DDevice_CopyRects, 3925, 9) { 0x4F, 0x84 }, { 0x75, 0x15 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DVertexBuffer_GetDesc // ****************************************************************** @@ -4052,7 +4192,8 @@ OOVPA_NO_XREF(D3DVertexBuffer_GetDesc, 3925, 7) { 0x16, 0x46 }, { 0x1A, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetShaderConstantMode // ****************************************************************** @@ -4067,7 +4208,8 @@ OOVPA_NO_XREF(D3DDevice_GetShaderConstantMode, 3925, 8) { 0x10, 0x0A }, { 0x13, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShader // ****************************************************************** @@ -4081,7 +4223,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShader, 3925, 7) { 0x10, 0x0A }, { 0x13, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderConstant // ****************************************************************** @@ -4097,7 +4240,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderConstant, 3925, 9) { 0x18, 0x00 }, { 0x1F, 0xF7 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderInput // ****************************************************************** @@ -4112,7 +4256,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderInput, 3925, 8) { 0x18, 0x04 }, { 0x1F, 0x20 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_RunVertexStateShader // ****************************************************************** @@ -4128,7 +4273,8 @@ OOVPA_NO_XREF(D3DDevice_RunVertexStateShader, 3925, 9) { 0x16, 0x41 }, { 0x1F, 0x41 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderType // ****************************************************************** @@ -4142,7 +4288,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderType, 3925, 7) { 0x22, 0xC9 }, { 0x28, 0x08 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderDeclaration // ****************************************************************** @@ -4158,7 +4305,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderDeclaration, 3925, 9) { 0x11F, 0x83 }, { 0x129, 0x0F }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetVertexShaderFunction // ****************************************************************** @@ -4172,7 +4320,8 @@ OOVPA_NO_XREF(D3DDevice_GetVertexShaderFunction, 3925, 7) { 0x8E, 0x00 }, { 0xA6, 0xF8 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetPixelShader // ****************************************************************** @@ -4186,7 +4335,8 @@ OOVPA_NO_XREF(D3DDevice_GetPixelShader, 3925, 7) { 0x10, 0x0A }, { 0x13, 0x00 }, OOVPA_END; - +#endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_IsFencePending // ****************************************************************** @@ -4204,6 +4354,7 @@ OOVPA_NO_XREF(D3DDevice_IsFencePending, 3925, 11) { 0x1A, 0x1B }, { 0x1F, 0x04 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * CMiniport::InitHardware @@ -4309,6 +4460,7 @@ OOVPA_NO_XREF(D3D_CMiniport_GetDisplayCapabilities, 3911, 15) { 0x1E, 0xC3 }, OOVPA_END; #endif +#if 0 // Moved to 3911 // ****************************************************************** // * D3DDevice_GetPushBufferOffset // ****************************************************************** @@ -4322,6 +4474,7 @@ OOVPA_NO_XREF(D3DDevice_GetPushBufferOffset, 3925, 7) { 0x82, 0x04 }, { 0x98, 0x89 }, OOVPA_END; +#endif #if 0 // Moved to 3911 // ****************************************************************** // * D3DBaseTexture_GetLevelCount @@ -4633,178 +4786,178 @@ OOVPA_END; OOVPATable D3D8_3925[] = { REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_IsBusy, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), - REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetMaterial, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackMaterial, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SelectVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_IsBusy, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), + REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetMaterial, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackMaterial, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SelectVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderTarget, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetStreamSource, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetIndices, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_SetViewport, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_Begin, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2f, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData2s, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4f, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_End, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_Clear, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPalette, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderTarget, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetStreamSource, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetIndices, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_SetViewport, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_Begin, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2f, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData2s, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4f, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_End, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_Clear, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPalette, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_TexCoordIndex, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetTransform, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetBackBuffer, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetRenderTarget, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Simple, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTransform, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FogColor, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FillMode, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetBackBuffer, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetRenderTarget, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DVertexBuffer_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_IsBusy, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DVertexBuffer_Lock, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_IsBusy, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), - REGISTER_OOVPA(Get2DSurfaceDesc, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetMaterial, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetViewport, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), + REGISTER_OOVPA(Get2DSurfaceDesc, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetMaterial, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetViewport, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_VertexBlend, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TwoSidedLighting, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_PersistDisplay, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DrawVertices, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetDisplayMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_PersistDisplay, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DrawVertices, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetDisplayMode, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4s, 3911, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), - REGISTER_OOVPA(D3DResource_GetType, 3925, DISABLED), // Probably not even necessary... - REGISTER_OOVPA(D3D_AllocContiguousMemory, 3925, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(D3DDevice_SetRenderState_Deferred, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DResource_GetType, 3911, DISABLED), // Probably not even necessary... + REGISTER_OOVPA(D3D_AllocContiguousMemory, 3911, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH + REGISTER_OOVPA(D3DDevice_SetRenderState_Deferred, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_SetRenderTarget, 3948, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetTile, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_KickOff, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetModelView, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_FlushVertexCache, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetScissors, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_InsertCallback, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH), - REGISTER_OOVPA(XMETAL_StartPush, 3925, DISABLED), - REGISTER_OOVPA(D3D_SetFence, 3925, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_KickOff, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetModelView, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_FlushVertexCache, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetScissors, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_InsertCallback, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_EndPushBuffer, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, PATCH), + REGISTER_OOVPA(XMETAL_StartPush, 3911, DISABLED), + REGISTER_OOVPA(D3D_SetFence, 3911, XREF), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_Reset, 3925, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3D_SetCommonDebugRegisters, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateImageSurface, 3925, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 3925, PATCH), - REGISTER_OOVPA(D3D_BlockOnResource, 3925, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_Reset, 3911, PATCH), + REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), + REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), + REGISTER_OOVPA(D3D_SetCommonDebugRegisters, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateImageSurface, 3911, PATCH), + REGISTER_OOVPA(D3D_BlockOnTime, 3911, PATCH), + REGISTER_OOVPA(D3D_BlockOnResource, 3911, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_EndStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_SetTile, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetBackMaterial, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetModelView, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CopyRects, 3925, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetPixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_IsFencePending, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetTile, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetBackMaterial, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetModelView, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CopyRects, 3911, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetPixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_IsFencePending, 3911, PATCH), REGISTER_OOVPA(CMiniport_InitHardware, 3911, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 3911, PATCH), REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 532a0cc04..fd185872a 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -2308,7 +2308,7 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3D_CMiniport_GetDisplayCapabilities, 3911, PATCH), REGISTER_OOVPA(Direct3D_CreateDevice, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), // ****************************************************************** // Tested on version 4039, The Simpsons - Road Rage (PAL) 4039 etc @@ -2335,13 +2335,13 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), 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(D3D_BlockOnTime, 4039, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 4039, PATCH), @@ -2368,33 +2368,33 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_GetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_GetType, 4034, PATCH), - REGISTER_OOVPA(D3D_AllocContiguousMemory, 3925, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH - REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3D_AllocContiguousMemory, 3911, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH + REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), @@ -2405,8 +2405,8 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_ColorKeyColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), // TODO: Unused? REGISTER_OOVPA(D3DDevice_SetIndices, 4034, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_EdgeAntiAlias, 4034, PATCH), @@ -2431,9 +2431,9 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_TextureFactor, 4034, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), + 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(D3DVertexBuffer_Lock, 4034, PATCH), @@ -2447,15 +2447,15 @@ OOVPATable D3D8_4034[] = { REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4034, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + 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_SetRenderState_LineWidth, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, 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_InsertFence, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_AddRef, 4039, PATCH), // ****************************************************************** @@ -2464,20 +2464,20 @@ OOVPATable D3D8_4034[] = { // ****************************************************************** // REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), - REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), // REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_InsertCallback, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_SwitchTexture, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), @@ -2485,13 +2485,13 @@ OOVPATable D3D8_4034[] = { // REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), // REGISTER_OOVPA(D3D_MakeRequestedSpace, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), // REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 18f8694d0..cc1965e45 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -2721,46 +2721,46 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4034, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_Begin, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 3911, PATCH), REGISTER_OOVPA(D3DDevice_End, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPalette, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_Present, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_Present, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), // Just calls Lock2DSurface - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, PATCH), + REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), // Just calls Lock2DSurface + REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH), + 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(D3D_CreateStandAloneSurface, 4134, XREF), @@ -2783,7 +2783,7 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), @@ -2793,7 +2793,7 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, 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), @@ -2806,9 +2806,9 @@ OOVPATable D3D8_4134[] = { 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_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_MultiSampleMode, 4134, PATCH), @@ -2817,26 +2817,26 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), 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_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, 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, 3925, DISABLED), + REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVerticalBlankCallback, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4134, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), @@ -2845,20 +2845,20 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3D_BlockOnTime, 3925, PATCH), + REGISTER_OOVPA(D3D_BlockOnTime, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, 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_PersistDisplay, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 4039, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), @@ -2878,13 +2878,13 @@ OOVPATable D3D8_4134[] = { REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4134, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, 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_SwitchTexture, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SwitchTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index d03734caf..2a1d0a706 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -1219,36 +1219,36 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetRenderTarget, 4134, PATCH), REGISTER_OOVPA(D3DDevice_AddRef, 4242, PATCH), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4361, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 4134, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetPixelShaderProgram, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BumpEnv, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), REGISTER_OOVPA(D3DDevice_SetTexture, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_CreateVertexBuffer, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_EnableOverlay, 4134, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 4361, PATCH), @@ -1270,7 +1270,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), @@ -1279,26 +1279,26 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DResource_Release, 4361, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_GetSurfaceLevel, 3925, 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_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 3925, DISABLED), // TODO: This needs to be verified on 4361, not just 4242! - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DPalette_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), // Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), // Just calls Lock2DSurface + 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! + REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + 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(D3D_KickOffAndWaitForIdle, 4034, PATCH), @@ -1310,9 +1310,9 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_MultiSampleMode, 4134, PATCH), @@ -1321,11 +1321,11 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, 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_InsertFence, 3925, PATCH), + 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), @@ -1335,7 +1335,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), @@ -1348,18 +1348,18 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), - REGISTER_OOVPA(D3D_GetAdapterIdentifier, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), + 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_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4134, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), @@ -1368,7 +1368,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), @@ -1380,7 +1380,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), @@ -1397,7 +1397,7 @@ OOVPATable D3D8_4361[] = { REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetModelView, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayFieldStatus, 4039, PATCH), }; diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index b646112af..59c6fe57c 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -661,7 +661,7 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget, 4432, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4432, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 4034, PATCH), @@ -679,11 +679,11 @@ OOVPATable D3D8_4432[] { 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_ZBias, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4361, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, 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), @@ -693,9 +693,9 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_ZEnable, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleAntiAlias, 4432, PATCH), @@ -708,9 +708,9 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_Clear, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePalette, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePalette, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPalette, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_CreateTexture, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateTexture, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Swap, 4034, PATCH), // REGISTER_OOVPA(D3DDevice_Swap, 4531, PATCH), REGISTER_OOVPA(D3DDevice_UpdateOverlay, 3911, PATCH), @@ -721,45 +721,45 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, 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(D3DPalette_Lock, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DPalette_Lock, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), // REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, 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_CreateVertexBuffer, 3925, DISABLED), + 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_SetVertexShaderConstant, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetViewport, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetGammaRamp, 3925, 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), @@ -768,11 +768,11 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetIndices, 4134, DISABLED), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + 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, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4432, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), @@ -782,20 +782,20 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SetScissors, 4361, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 4039, PATCH), - REGISTER_OOVPA(D3DDevice_GetPushBufferOffset, 3925, 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_CreateVolumeTexture, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface + 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_SetPixelShaderProgram, 3925, 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), @@ -805,7 +805,7 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 4134, PATCH), @@ -817,17 +817,17 @@ OOVPATable D3D8_4432[] { REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH),// Just calls Lock2DSurface + 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(D3DDevice_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 4134, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4034, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 4361, PATCH), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, 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), @@ -839,7 +839,7 @@ OOVPATable D3D8_4432[] { // TODO: Need test cases // ****************************************************************** REGISTER_OOVPA(D3DDevice_DrawRectPatch, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetOverlayUpdateStatus, 3911, PATCH), // ****************************************************************** diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index 87b08ea99..75e6bf7ca 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -3412,7 +3412,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 4627, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_BeginPush, 4627, PATCH), @@ -3435,7 +3435,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_GetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), @@ -3443,8 +3443,8 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 4627, PATCH), // REGISTER_OOVPA(D3DDevice_CreateTexture2, 4831, PATCH), @@ -3475,7 +3475,7 @@ OOVPATable D3D8_4627[] = { 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_ZBias, 3925, 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_BackFillMode, 4134, PATCH), @@ -3498,7 +3498,7 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_SetVertexShader, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 4034, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 4134, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 4627, PATCH), @@ -3506,22 +3506,22 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_LightEnable, 3911, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + 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(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, 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(D3DTexture_GetSurfaceLevel, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), // Just calls Lock3DSurface + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 4134, PATCH), @@ -3532,10 +3532,10 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShader, 4627, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), @@ -3550,11 +3550,11 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_InsertCallback, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), REGISTER_OOVPA(D3D_SetFence, 4134, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + 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... @@ -3563,9 +3563,9 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_PersistDisplay, 4627, PATCH), // REGISTER_OOVPA(D3DDevice_PersistDisplay, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 4627, PATCH), @@ -3579,13 +3579,13 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 4627, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH),//TODO 4721,4928 REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface, 4627, PATCH), // Called D3DCubeTexture_GetCubeMapSurface2 @@ -3607,11 +3607,11 @@ OOVPATable D3D8_4627[] = { REGISTER_OOVPA(D3DDevice_KickPushBuffer, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(CMiniport_IsFlipPending, 4627, XREF), REGISTER_OOVPA(CMiniport_InitHardware, 4627, PATCH), REGISTER_OOVPA(CMiniport_CreateCtxDmaObject, 4034, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl index f6d972c3a..f9ee986a8 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl @@ -1144,7 +1144,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_BeginVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVisibilityTestResult, 3911, PATCH), REGISTER_OOVPA(D3D_KickOffAndWaitForIdle, 5028, PATCH), REGISTER_OOVPA(D3DDevice_LazySetStateVB, 5028, XREF), REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), @@ -1163,7 +1163,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), @@ -1171,8 +1171,8 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), + 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), @@ -1199,7 +1199,7 @@ OOVPATable D3D8_5028[] = { 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_ZBias, 3925, 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_BackFillMode, 4134, PATCH), @@ -1222,26 +1222,26 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetLightEnable, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5028, PATCH), REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5028, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, 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(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, 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(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH), // Just calls Lock3DSurface + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH), // Just calls Lock3DSurface REGISTER_OOVPA(D3DDevice_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetShaderConstantMode, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), @@ -1252,10 +1252,10 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), @@ -1268,11 +1268,11 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 4039, PATCH), REGISTER_OOVPA(D3DDevice_InsertCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMask, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_LogicOp, 4627, PATCH), REGISTER_OOVPA(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + 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... @@ -1281,9 +1281,9 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetStateUP, 4627, DISABLED), REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetStipple, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_PersistDisplay, 4831, PATCH), REGISTER_OOVPA(D3DDevice_SetSwapCallback, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), @@ -1293,9 +1293,9 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_SetVertexData4ub, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4f, 4039, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), @@ -1313,20 +1313,20 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_SampleAlpha, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetVertexDataColor, 4361, 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(D3DVertexBuffer_GetDesc, 3925, DISABLED), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetScissors, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsBusy, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), // ****************************************************************** // Provisional registration functions in XDK 5028 @@ -1342,7 +1342,7 @@ OOVPATable D3D8_5028[] = { REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), // REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index bd257d9f9..bc598c7eb 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -665,7 +665,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetScissors, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), @@ -675,18 +675,18 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 4627, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 4627, ALIAS, D3DDevice_SetVertexShaderConstantNotInlineFast), - REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_CreatePixelShader, 3925, PATCH), + 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), @@ -708,7 +708,7 @@ OOVPATable D3D8_5233[] = { 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_ZBias, 3925, 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_BackFillMode, 4134, PATCH), @@ -721,9 +721,9 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_MultiSampleAntiAlias, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_ShadowFunc, 4134, PATCH), @@ -731,8 +731,8 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, 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_DrawIndexedVertices, 5028, PATCH), @@ -740,40 +740,40 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_GetMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 4627, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5028, 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(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, 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_GetViewportOffsetAndScale, 4432, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 3925, 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(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetPalette, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), @@ -795,7 +795,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_EndVisibilityTest, 4627, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), @@ -812,8 +812,8 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_CreatePalette2, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, 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_DrawIndexedVerticesUP, 5028, PATCH), @@ -821,7 +821,7 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_GetProjectionViewportMatrix, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), @@ -838,9 +838,9 @@ OOVPATable D3D8_5233[] = { REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, 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), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl index 5eec74ac7..f9c8cb7e7 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5344.inl @@ -1145,7 +1145,7 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), // Was 5233 REGISTER_OOVPA(D3DDevice_GetGammaRamp, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetGammaRamp, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetRenderTarget2, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5028, PATCH), @@ -1154,13 +1154,13 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_Reset, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3D_ClearStateBlockFlags, 3911, XREF), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), @@ -1189,7 +1189,7 @@ OOVPATable D3D8_5344[] = { 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_ZBias, 3925, 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_BackFillMode, 4134, PATCH), @@ -1202,9 +1202,9 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_LineWidth, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_OcclusionCullEnable, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilCullEnable, 4034, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_MultiSampleAntiAlias, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleMode, 5233, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, PATCH), // Was 5233 @@ -1213,30 +1213,30 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_YuvEnable, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTransform, 5344, PATCH), // Was 4134 REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5344, PATCH), REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), // Was 5233 REGISTER_OOVPA(D3DDevice_DrawIndexedVertices, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 5344, PATCH), // Was 4627 - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5344, 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_SetViewport, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), REGISTER_OOVPA(D3DResource_IsBusy, 4039, PATCH), REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233 - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, 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), @@ -1248,11 +1248,11 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_Release, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5344, PATCH), // Was 5233 REGISTER_OOVPA(D3D_SetFence, 5028, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5028, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5028, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), + REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetPalette, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetCreationParameters, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), @@ -1296,9 +1296,9 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInputDirect, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5344, PATCH), @@ -1314,7 +1314,7 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_LoadVertexShaderProgram, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetBackBufferScale, 4134, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndPushBuffer, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunPushBuffer, 5120, PATCH), @@ -1325,11 +1325,11 @@ OOVPATable D3D8_5344[] = { REGISTER_OOVPA(D3DDevice_CreateVolumeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + 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_DeleteStateBlock, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5028, PATCH), REGISTER_OOVPA(D3DDevice_CreateImageSurface, 4627, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl index 9cdd2fe23..e1f1a512d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5558.inl @@ -2070,12 +2070,12 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_BeginPush, 5028, PATCH), REGISTER_OOVPA(D3DDevice_EndPush, 4134, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstantNotInline, 5558, PATCH), @@ -2099,7 +2099,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetTextureState_BorderColor, 4361, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_ZBias, 3925, 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), @@ -2107,7 +2107,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_ZEnable, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilEnable, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 5558, PATCH), @@ -2135,27 +2135,27 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), + REGISTER_OOVPA(D3DResource_Register, 3911, PATCH), + REGISTER_OOVPA(D3DResource_AddRef, 3911, PATCH), + REGISTER_OOVPA(D3DResource_Release, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + 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(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetScissors, 5344, PATCH), @@ -2164,7 +2164,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5344, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_DrawVerticesUP, 5558, PATCH), - REGISTER_OOVPA(D3DDevice_GetTransform, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetTransform, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetTransform, 4039, PATCH), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer2, 5344, DISABLED), REGISTER_OOVPA(D3DDevice_CreateIndexBuffer, 4627, DISABLED), @@ -2194,14 +2194,14 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_BeginStateBlock, 4134, PATCH), REGISTER_OOVPA(D3D_RecordStateBlock, 3911, XREF), REGISTER_OOVPA(D3DDevice_EndStateBlock, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), REGISTER_OOVPA(Get2DSurfaceDesc, 5558, PATCH), REGISTER_OOVPA(D3D_MakeRequestedSpace, 5558, PATCH), REGISTER_OOVPA(D3DDevice_MakeSpace, 5558, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderTarget, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 5558, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetFlickerFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5455, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), @@ -2221,10 +2221,10 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetVertexData2f, 4039, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, PATCH), REGISTER_OOVPA(D3DCubeTexture_GetCubeMapSurface2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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_SetRenderState_BackFillMode, 4134, PATCH), @@ -2242,7 +2242,7 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_SetSoftDisplayFilter, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_CreateStateBlock, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, 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 @@ -2264,8 +2264,8 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_CreateCubeTexture, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + 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_GetTile, 5455, PATCH), @@ -2276,9 +2276,9 @@ OOVPATable D3D8_5558[] = { REGISTER_OOVPA(D3DDevice_GetVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, 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), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl index 74a25b103..fc35381b4 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl @@ -1070,7 +1070,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), @@ -1085,7 +1085,7 @@ OOVPATable D3D8_5788[] = { 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_ZBias, 3925, 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), @@ -1115,22 +1115,22 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, 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(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), - REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3925, DISABLED), - REGISTER_OOVPA(D3DSurface_GetDesc, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), + REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 3911, DISABLED), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH), REGISTER_OOVPA(D3DVertexBuffer_Lock2, 5788, PATCH), @@ -1139,12 +1139,12 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), REGISTER_OOVPA(D3D_SetPushBufferSize, 3911, DISABLED), REGISTER_OOVPA(Direct3D_CheckDeviceMultiSampleType, 3911, DISABLED), - REGISTER_OOVPA(D3D_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3D_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH REGISTER_OOVPA(Get2DSurfaceDesc, 5788, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), @@ -1155,7 +1155,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetShaderConstantMode, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SetViewport, 5455, PATCH), REGISTER_OOVPA(D3DDevice_BlockUntilVerticalBlank, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED), + REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_SetRenderState_FrontFace, 4134, PATCH), REGISTER_OOVPA(D3DDevice_GetModelView, 4134, PATCH), REGISTER_OOVPA(D3DDevice_SetBackMaterial, 5788, PATCH), @@ -1186,7 +1186,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), REGISTER_OOVPA(D3D_Unknown, 5788, XREF), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), @@ -1199,9 +1199,9 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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), @@ -1217,7 +1217,7 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, 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), @@ -1232,8 +1232,8 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + 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_GetProjectionViewportMatrix, 5558, PATCH), @@ -1242,17 +1242,17 @@ OOVPATable D3D8_5788[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderInput, 4361, PATCH), REGISTER_OOVPA(D3DDevice_PrimeVertexCache, 4627, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DeleteVertexShader, 5344, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5558, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, 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_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetScreenSpaceOffset, 5455, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl index e2174fac8..ab435d292 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5849.inl @@ -187,7 +187,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_Swap, 5233, PATCH), REGISTER_OOVPA(D3DDevice_GetBackBuffer2, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetDepthStencilSurface2, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_CreateVertexShader, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CreatePixelShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetPixelShader, 4627, PATCH), REGISTER_OOVPA(D3DDevice_GetDisplayMode, 4627, PATCH), @@ -203,7 +203,7 @@ OOVPATable D3D8_5849[] = { 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_ZBias, 3925, 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), @@ -231,18 +231,18 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_DrawIndexedVerticesUP, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetMaterial, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetStreamSource, 4034, PATCH), - REGISTER_OOVPA(D3DResource_Register, 3925, PATCH), - REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH), - REGISTER_OOVPA(D3DResource_Release, 3925, 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(D3DSurface_GetDesc, 3925, PATCH), + REGISTER_OOVPA(D3DSurface_GetDesc, 3911, PATCH), REGISTER_OOVPA(D3DDevice_CopyRects, 5120, PATCH), REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH), - REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH), - REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DTexture_LockRect, 3911, PATCH), + REGISTER_OOVPA(D3DSurface_LockRect, 3911, PATCH), REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 3911, PATCH), REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetLight, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetLight, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetLight, 5558, PATCH), REGISTER_OOVPA(D3DDevice_CreateVertexBuffer2, 5455, DISABLED), REGISTER_OOVPA(D3DVertexBuffer_Lock, 5788, PATCH), @@ -250,14 +250,14 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_LightEnable, 5344, PATCH), REGISTER_OOVPA(D3DDevice_DrawVertices, 5028, PATCH), REGISTER_OOVPA(D3D_SetFence, 5558, XREF), - REGISTER_OOVPA(D3DDevice_InsertFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_InsertFence, 3911, PATCH), REGISTER_OOVPA(D3DDevice_IsFencePending, 5558, PATCH), REGISTER_OOVPA(D3D_BlockOnTime, 5849, XREF), - REGISTER_OOVPA(D3DDevice_BlockOnFence, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_BlockOnFence, 3911, PATCH), REGISTER_OOVPA(D3D_AllocContiguousMemory, 5788, DISABLED), // Just calls MmAllocateContiguousMemory. Was PATCH REGISTER_OOVPA(Get2DSurfaceDesc, 5849, PATCH), REGISTER_OOVPA(D3DDevice_CreateTexture2, 5028, PATCH), - REGISTER_OOVPA(Lock2DSurface, 3925, PATCH), + REGISTER_OOVPA(Lock2DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant4, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 5788, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1, 4627, ALIAS, D3DDevice_SetVertexShaderConstant1Fast), @@ -297,7 +297,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3D_MakeRequestedSpace, 5788, XREF), REGISTER_OOVPA(D3D_Unknown, 5788, XREF), REGISTER_OOVPA(D3DDevice_FlushVertexCache, 4134, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderSize, 3911, PATCH), REGISTER_OOVPA(D3DDevice_LoadVertexShader, 5028, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShader, 5455, PATCH), REGISTER_OOVPA(D3DDevice_RunVertexStateShader, 4134, PATCH), @@ -310,9 +310,9 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SetRenderState_Dxt1NoiseEnable, 5558, PATCH), REGISTER_OOVPA(D3DDevice_GetTile, 5455, PATCH), REGISTER_OOVPA(D3DDevice_KickOff, 5788, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_RopZRead, 3925, PATCH), - REGISTER_OOVPA(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 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), @@ -326,7 +326,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_GetBackMaterial, 5788, PATCH), REGISTER_OOVPA(D3DDevice_ApplyStateBlock, 4627, PATCH), REGISTER_OOVPA(D3DDevice_CaptureStateBlock, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_DeleteStateBlock, 3925, 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), @@ -339,7 +339,7 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SwitchTexture, 4361, PATCH), REGISTER_OOVPA(D3DDevice_DeletePixelShader, 5344, PATCH), REGISTER_OOVPA(D3D_BlockOnResource, 4034, XREF), - REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3925, PATCH), + REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 3911, PATCH), REGISTER_OOVPA(D3DDevice_DrawTriPatch, 3911, DISABLED), REGISTER_OOVPA(D3DDevice_IsBusy, 5344, PATCH), REGISTER_OOVPA(D3DDevice_GetMaterial, 5788, PATCH), @@ -349,8 +349,8 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant, 4627, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexShaderConstant1Fast, 4627, XREF), REGISTER_OOVPA(D3DDevice_SetRenderState_PSTextureModes, 4034, PATCH), - REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3925, PATCH),// Just calls Lock3DSurface - REGISTER_OOVPA(D3DCubeTexture_LockRect, 3925, PATCH), + REGISTER_OOVPA(D3DVolumeTexture_LockBox, 3911, PATCH),// Just calls Lock3DSurface + REGISTER_OOVPA(D3DCubeTexture_LockRect, 3911, PATCH), REGISTER_OOVPA(Lock3DSurface, 3911, PATCH), REGISTER_OOVPA(D3DDevice_PersistDisplay, 5558, PATCH), REGISTER_OOVPA(D3DDevice_SetVertexData4s, 4361, PATCH), @@ -362,9 +362,9 @@ OOVPATable D3D8_5849[] = { REGISTER_OOVPA(D3DDevice_GetVertexShader, 5788, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderConstant, 5028, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderInput, 4627, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderType, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetVertexShaderDeclaration, 5455, PATCH), - REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3925, PATCH), + REGISTER_OOVPA(D3DDevice_GetVertexShaderFunction, 3911, PATCH), REGISTER_OOVPA(D3DDevice_GetPixelShader, 5788, PATCH), REGISTER_OOVPA(D3D_LazySetPointParams, 4039, PATCH), REGISTER_OOVPA(D3DDevice_SelectVertexShaderDirect, 4361, PATCH), diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl index af841b74c..bf6b2cd3f 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.OOVPA.inl @@ -131,211 +131,211 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3DBaseTexture_GetLevelCount, PATCH, 3911), REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface, PATCH, 3911, 4134, 4627, 5558), // Called D3DCubeTexture_GetCubeMapSurface2 (from 4627's comment) NOTE: Use D3DCubeTexture_GetCubeMapSurface2 for 4627 and above REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface2, PATCH, 4627), - REGISTER_OOVPAS(D3DCubeTexture_LockRect, PATCH, 3925), // Just calls Lock2DSurface (from 4134, 4432's comment) - REGISTER_OOVPAS(D3DDevice_AddRef, PATCH, 3925, 4039, 4134, 4242, 4627, 5028, 5344, 5558, 5659), - REGISTER_OOVPAS(D3DDevice_ApplyStateBlock, PATCH, 3925, 4361, 4627), - REGISTER_OOVPAS(D3DDevice_Begin, PATCH, 3925, 4039), + REGISTER_OOVPAS(D3DCubeTexture_LockRect, PATCH, 3911), // Just calls Lock2DSurface (from 4134, 4432's comment) + REGISTER_OOVPAS(D3DDevice_AddRef, PATCH, 3911, 4039, 4134, 4242, 4627, 5028, 5344, 5558, 5659), + REGISTER_OOVPAS(D3DDevice_ApplyStateBlock, PATCH, 3911, 4361, 4627), + REGISTER_OOVPAS(D3DDevice_Begin, PATCH, 3911, 4039), REGISTER_OOVPAS(D3DDevice_BeginPush, PATCH, 4134, 4432, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_BeginPushBuffer, PATCH, 3925, 4134), // Not implemented yet. (from 5788's comment) + REGISTER_OOVPAS(D3DDevice_BeginPushBuffer, PATCH, 3911, 4134), // Not implemented yet. (from 5788's comment) REGISTER_OOVPAS(D3DDevice_BeginStateBig, XREF, 5028), REGISTER_OOVPAS(D3DDevice_BeginStateBlock, PATCH, 3911, 4134), - REGISTER_OOVPAS(D3DDevice_BeginVisibilityTest, PATCH, 3925, 4034, 4361, 4627), - REGISTER_OOVPAS(D3DDevice_BlockOnFence, PATCH, 3925/*, 4039, 4134, 5233*/), - REGISTER_OOVPAS(D3DDevice_BlockUntilVerticalBlank, PATCH, 3925, 4039, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5788), - REGISTER_OOVPAS(D3DDevice_CaptureStateBlock, PATCH, 3925, 4134, 4627, 5455), - REGISTER_OOVPAS(D3DDevice_Clear, PATCH, 3925, 4034, 4134, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_CopyRects, PATCH, 3925, 4034, 4134, 4627, 5120), - REGISTER_OOVPAS(D3DDevice_CreateCubeTexture, PATCH, 3925, 4361, 4627), - REGISTER_OOVPAS(D3DDevice_CreateImageSurface, PATCH, 3925, 4034, 4134, 4627),//TODO 4721,4928 (from 4627's comment) - REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer, UNPATCHED, 3925, 4627/*, 5558*/), // TODO: This needs to be verified on 4361 + REGISTER_OOVPAS(D3DDevice_BeginVisibilityTest, PATCH, 3911, 4034, 4361, 4627), + REGISTER_OOVPAS(D3DDevice_BlockOnFence, PATCH, 3911/*, 4039, 4134, 5233*/), + REGISTER_OOVPAS(D3DDevice_BlockUntilVerticalBlank, PATCH, 3911, 4039, 4134, 4361, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_CaptureStateBlock, PATCH, 3911, 4134, 4627, 5455), + REGISTER_OOVPAS(D3DDevice_Clear, PATCH, 3911, 4034, 4134, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_CopyRects, PATCH, 3911, 4034, 4134, 4627, 5120), + REGISTER_OOVPAS(D3DDevice_CreateCubeTexture, PATCH, 3911, 4361, 4627), + REGISTER_OOVPAS(D3DDevice_CreateImageSurface, PATCH, 3911, 4034, 4134, 4627),//TODO 4721,4928 (from 4627's comment) + REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer, UNPATCHED, 3911, 4627/*, 5558*/), // TODO: This needs to be verified on 4361 REGISTER_OOVPAS(D3DDevice_CreateIndexBuffer2, UNPATCHED, 4627, 5344), - REGISTER_OOVPAS(D3DDevice_CreatePalette, PATCH, 3925, 4627), // Called D3DDevice_CreatePalette2 (from 4627's comment) NOTE: Use D3DDevice_CreatePalette2 for 4627 and above + REGISTER_OOVPAS(D3DDevice_CreatePalette, PATCH, 3911, 4627), // Called D3DDevice_CreatePalette2 (from 4627's comment) NOTE: Use D3DDevice_CreatePalette2 for 4627 and above REGISTER_OOVPAS(D3DDevice_CreatePalette2, PATCH, 4627, 5344, 5455), - REGISTER_OOVPAS(D3DDevice_CreatePixelShader, PATCH, 3925, 5344, 5788), - REGISTER_OOVPAS(D3DDevice_CreateStateBlock, PATCH, 3925, 4627), - REGISTER_OOVPAS(D3DDevice_CreateTexture, PATCH, 3925, 4627),// Called D3DDevice_CreateTexture2 (from 4627's comment) NOTE: Use D3DDevice_CreateTexture2 for 4627 and above + REGISTER_OOVPAS(D3DDevice_CreatePixelShader, PATCH, 3911, 5344, 5788), + REGISTER_OOVPAS(D3DDevice_CreateStateBlock, PATCH, 3911, 4627), + REGISTER_OOVPAS(D3DDevice_CreateTexture, PATCH, 3911, 4627),// Called D3DDevice_CreateTexture2 (from 4627's comment) NOTE: Use D3DDevice_CreateTexture2 for 4627 and above REGISTER_OOVPAS(D3DDevice_CreateTexture2, PATCH, 4627, 4831, 5028, 5233), // Was 4627 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer, UNPATCHED, 3925), + REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer, UNPATCHED, 3911), REGISTER_OOVPAS(D3DDevice_CreateVertexBuffer2, UNPATCHED, 4627, 5344, 5455), - REGISTER_OOVPAS(D3DDevice_CreateVertexShader, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3925, 4627), + REGISTER_OOVPAS(D3DDevice_CreateVertexShader, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_CreateVolumeTexture, PATCH, 3911, 4627), REGISTER_OOVPAS(D3DDevice_DeletePatch, UNPATCHED, 4034), // (TODO) (from 4034's comment) - REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3925, 5344), - REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3925/*, 4361, 5788*/), - REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3925, 5344), - REGISTER_OOVPAS(D3DDevice_DrawIndexedVertices, PATCH, 3925, 4034, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_DrawIndexedVerticesUP, PATCH, 3925, 4039, 4134, 4627, 5028, 5344, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_DeletePixelShader, PATCH, 3911, 5344), + REGISTER_OOVPAS(D3DDevice_DeleteStateBlock, PATCH, 3911/*, 4361, 5788*/), + REGISTER_OOVPAS(D3DDevice_DeleteVertexShader, PATCH, 3911, 5344), + REGISTER_OOVPAS(D3DDevice_DrawIndexedVertices, PATCH, 3911, 4034, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_DrawIndexedVerticesUP, PATCH, 3911, 4039, 4134, 4627, 5028, 5344, 5558, 5788), REGISTER_OOVPAS(D3DDevice_DrawRectPatch, PATCH, 3911), // TODO: Unused? (from 4034's comment) REGISTER_OOVPAS(D3DDevice_DrawTriPatch, UNPATCHED, 3911), - REGISTER_OOVPAS(D3DDevice_DrawVertices, PATCH, 3925, 4034, 5028), - REGISTER_OOVPAS(D3DDevice_DrawVerticesUP, PATCH, 3925, 4039, 4134, 4627, 5344, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_DrawVertices, PATCH, 3911, 4034, 5028), + REGISTER_OOVPAS(D3DDevice_DrawVerticesUP, PATCH, 3911, 4039, 4134, 4627, 5344, 5558, 5788), REGISTER_OOVPAS(D3DDevice_EnableOverlay, PATCH, 3911, 4134), - REGISTER_OOVPAS(D3DDevice_End, PATCH, 3925, 4039, 4627, 5028, 5344, 5558), + REGISTER_OOVPAS(D3DDevice_End, PATCH, 3911, 4039, 4627, 5028, 5344, 5558), REGISTER_OOVPAS(D3DDevice_EndPush, PATCH, 4134/*, 4627*/), // Was 4627 (from 5233's comment) - REGISTER_OOVPAS(D3DDevice_EndPushBuffer, PATCH, 3925, 4134), // Not implemented yet. (from 5788's comment) + REGISTER_OOVPAS(D3DDevice_EndPushBuffer, PATCH, 3911, 4134), // Not implemented yet. (from 5788's comment) REGISTER_OOVPAS(D3DDevice_EndStateBlock, PATCH, 3911, 4134), - REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3925, 4034, 4361, 4627, 5788), - REGISTER_OOVPAS(D3DDevice_FlushVertexCache, PATCH, 3925, 4134), - REGISTER_OOVPAS(D3DDevice_GetBackBuffer, PATCH, 3925, 4034, 4134, 4627, 5558), // Called D3DDevice_GetBackBuffer2 (from 4627's comment) NOTE: Use D3DDevice_GetBackBuffer2 for 4627 and above + REGISTER_OOVPAS(D3DDevice_EndVisibilityTest, PATCH, 3911, 4034, 4361, 4627, 5788), + REGISTER_OOVPAS(D3DDevice_FlushVertexCache, PATCH, 3911, 4134), + REGISTER_OOVPAS(D3DDevice_GetBackBuffer, PATCH, 3911, 4034, 4134, 4627, 5558), // Called D3DDevice_GetBackBuffer2 (from 4627's comment) NOTE: Use D3DDevice_GetBackBuffer2 for 4627 and above REGISTER_OOVPAS(D3DDevice_GetBackBuffer2, PATCH, 4627, 5028, 5344, 5455, 5558, 5788), // 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_GetBackMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788), + REGISTER_OOVPAS(D3DDevice_GetBackMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788), REGISTER_OOVPAS(D3DDevice_GetCreationParameters, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_GetDepthStencilSurface, PATCH, 3911, 4627), // Called D3DDevice_GetDepthStencilSurface2 (from 4627's comment) NOTE: Use D3DDevice_GetDepthStencilSurface2 for 4627 and above REGISTER_OOVPAS(D3DDevice_GetDepthStencilSurface2, PATCH, 4627, 5028, 5788), - REGISTER_OOVPAS(D3DDevice_GetDeviceCaps, UNPATCHED, 3925), - REGISTER_OOVPAS(D3DDevice_GetDisplayFieldStatus, PATCH, 3925, 4039, 4432, 5233, 5788), - REGISTER_OOVPAS(D3DDevice_GetDisplayMode, PATCH, 3925, 4039, 4432, 4627), + REGISTER_OOVPAS(D3DDevice_GetDeviceCaps, UNPATCHED, 3911), + REGISTER_OOVPAS(D3DDevice_GetDisplayFieldStatus, PATCH, 3911, 4039, 4432, 5233, 5788), + REGISTER_OOVPAS(D3DDevice_GetDisplayMode, PATCH, 3911, 4039, 4432, 4627), REGISTER_OOVPAS(D3DDevice_GetGammaRamp, PATCH, 3911/*, 3925, 4034*/), - REGISTER_OOVPAS(D3DDevice_GetLight, PATCH, 3925), + REGISTER_OOVPAS(D3DDevice_GetLight, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_GetLightEnable, PATCH, 3911, 5344), - REGISTER_OOVPAS(D3DDevice_GetMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788), - REGISTER_OOVPAS(D3DDevice_GetModelView, PATCH, 3925, 4134), + REGISTER_OOVPAS(D3DDevice_GetMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788), + REGISTER_OOVPAS(D3DDevice_GetModelView, PATCH, 3911, 4134), REGISTER_OOVPAS(D3DDevice_GetOverlayUpdateStatus, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_GetPersistedSurface2, PATCH, 4928), // For only on Unreal Championship (from 4627's comment) - REGISTER_OOVPAS(D3DDevice_GetPixelShader, PATCH, 3925, 4039, 4134, 5028, 5558, 5788), - REGISTER_OOVPAS(D3DDevice_GetProjectionViewportMatrix, PATCH, 3925, 4134, 4432, 4627, 5344, 5558), // For 5455 (from 5558's comment) - REGISTER_OOVPAS(D3DDevice_GetPushBufferOffset, PATCH, 3925, 4627),//TODO 4831 (from 4627's comment) - REGISTER_OOVPAS(D3DDevice_GetRenderTarget, PATCH, 3925, 4039, 4134, 4361, 4432, 4627), // Called D3DDevice_GetRenderTarget2 (from 4627's comment) NOTE: Use D3DDevice_GetRenderTarget2 for 4627 and above + REGISTER_OOVPAS(D3DDevice_GetPixelShader, PATCH, 3911, 4039, 4134, 5028, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_GetProjectionViewportMatrix, PATCH, 3911, 4134, 4432, 4627, 5344, 5558), // For 5455 (from 5558's comment) + REGISTER_OOVPAS(D3DDevice_GetPushBufferOffset, PATCH, 3911, 4627),//TODO 4831 (from 4627's comment) + REGISTER_OOVPAS(D3DDevice_GetRenderTarget, PATCH, 3911, 4039, 4134, 4361, 4432, 4627), // Called D3DDevice_GetRenderTarget2 (from 4627's comment) NOTE: Use D3DDevice_GetRenderTarget2 for 4627 and above REGISTER_OOVPAS(D3DDevice_GetRenderTarget2, PATCH, 4627, 5028), REGISTER_OOVPAS(D3DDevice_GetScissors, PATCH, 3911, 5788), - REGISTER_OOVPAS(D3DDevice_GetShaderConstantMode, PATCH, 3925, 4134, 4627, 5344, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_GetShaderConstantMode, PATCH, 3911, 4134, 4627, 5344, 5558, 5788), REGISTER_OOVPAS(D3DDevice_GetStreamSource2, PATCH, 4627), REGISTER_OOVPAS(D3DDevice_GetTexture2, PATCH, 4627), - REGISTER_OOVPAS(D3DDevice_GetTile, PATCH, 3925, 4134, 4627, 5028, 5344, 5455), - REGISTER_OOVPAS(D3DDevice_GetTransform, PATCH, 3925, 4039), - REGISTER_OOVPAS(D3DDevice_GetVertexShader, PATCH, 3925, 4039, 4134, 5028, 5788), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderConstant, PATCH, 3925, 4039, 5028), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderDeclaration, PATCH, 3925, 4134, 4627, 5455), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderFunction, PATCH, 3925, 4134), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderInput, PATCH, 3925, 4134, 4627), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderSize, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_GetVertexShaderType, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_GetViewport, PATCH, 3925, 4034, 4134, 4627, 5344, 5455/*, 5788*/), // Was 4627 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_GetTile, PATCH, 3911, 4134, 4627, 5028, 5344, 5455), + REGISTER_OOVPAS(D3DDevice_GetTransform, PATCH, 3911, 4039), + REGISTER_OOVPAS(D3DDevice_GetVertexShader, PATCH, 3911, 4039, 4134, 5028, 5788), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderConstant, PATCH, 3911, 4039, 5028), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderDeclaration, PATCH, 3911, 4134, 4627, 5455), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderFunction, PATCH, 3911, 4134), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderInput, PATCH, 3911, 4134, 4627), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderSize, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_GetVertexShaderType, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_GetViewport, PATCH, 3911, 4034, 4134, 4627, 5344, 5455/*, 5788*/), // Was 4627 (from 5344's comment) REGISTER_OOVPAS(D3DDevice_GetViewportOffsetAndScale, PATCH, 4432/*, 5558*/), - REGISTER_OOVPAS(D3DDevice_GetVisibilityTestResult, PATCH, 3925, 5233), - REGISTER_OOVPAS(D3DDevice_InsertCallback, PATCH, 3925, 4134, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_InsertFence, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_IsBusy, PATCH, 3925, 4034, 5028, 5344), - REGISTER_OOVPAS(D3DDevice_IsFencePending, PATCH, 3925, 4039, 5028, 5558), - REGISTER_OOVPAS(D3DDevice_KickOff, PATCH, 3925, 4039, 4134, 4531, 5028, 5455, 5788), + REGISTER_OOVPAS(D3DDevice_GetVisibilityTestResult, PATCH, 3911, 5233), + REGISTER_OOVPAS(D3DDevice_InsertCallback, PATCH, 3911, 4134, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_InsertFence, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_IsBusy, PATCH, 3911, 4034, 5028, 5344), + REGISTER_OOVPAS(D3DDevice_IsFencePending, PATCH, 3911, 4039, 5028, 5558), + REGISTER_OOVPAS(D3DDevice_KickOff, PATCH, 3911, 4039, 4134, 4531, 5028, 5455, 5788), REGISTER_OOVPAS(D3DDevice_KickPushBuffer, PATCH, 4627), REGISTER_OOVPAS(D3DDevice_LazySetStateVB, XREF, 5028), REGISTER_OOVPAS(D3DDevice_LightEnable, PATCH, 3911, 5028, 5344), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_LoadVertexShader, PATCH, 3925, 4034, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, PATCH, 3925, 4134, 4627, 5558), + REGISTER_OOVPAS(D3DDevice_LoadVertexShader, PATCH, 3911, 4034, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, PATCH, 3911, 4134, 4627, 5558), REGISTER_OOVPAS(D3DDevice_MakeSpace, UNPATCHED, 5558), - REGISTER_OOVPAS(D3DDevice_PersistDisplay, PATCH, 3925, 4039, 4627, 4831, 5455, 5558), - REGISTER_OOVPAS(D3DDevice_Present, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3925, 4134, 4361, 4627), + REGISTER_OOVPAS(D3DDevice_PersistDisplay, PATCH, 3911, 4039, 4627, 4831, 5455, 5558), + REGISTER_OOVPAS(D3DDevice_Present, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_PrimeVertexCache, PATCH, 3911, 4134, 4361, 4627), REGISTER_OOVPAS(D3DDevice_Release, PATCH, 3911), - REGISTER_OOVPAS(D3DDevice_Reset, PATCH, 3925, 4039), + REGISTER_OOVPAS(D3DDevice_Reset, PATCH, 3911, 4039), REGISTER_OOVPAS(D3DDevice_RunPushBuffer, PATCH, 3911, 4039, 4627, 5120, 5558), // for 5455 (from 5558's comment) - REGISTER_OOVPAS(D3DDevice_RunVertexStateShader, PATCH, 3925, 4134), - REGISTER_OOVPAS(D3DDevice_SelectVertexShader, PATCH, 3925, 4039, 4627, 5344, 5455), + REGISTER_OOVPAS(D3DDevice_RunVertexStateShader, PATCH, 3911, 4134), + REGISTER_OOVPAS(D3DDevice_SelectVertexShader, PATCH, 3911, 4039, 4627, 5344, 5455), REGISTER_OOVPAS(D3DDevice_SelectVertexShaderDirect, PATCH, 4361), REGISTER_OOVPAS(D3DDevice_SetBackBufferScale, PATCH, 4134), - REGISTER_OOVPAS(D3DDevice_SetBackMaterial, PATCH, 3925, 4134, 4627, 5344, 5455, 5558, 5659, 5788), + REGISTER_OOVPAS(D3DDevice_SetBackMaterial, PATCH, 3911, 4134, 4627, 5344, 5455, 5558, 5659, 5788), REGISTER_OOVPAS(D3DDevice_SetDepthClipPlanes, PATCH, 4627, 5788, 5849), - REGISTER_OOVPAS(D3DDevice_SetFlickerFilter, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetGammaRamp, PATCH, 3925, 4627), - REGISTER_OOVPAS(D3DDevice_SetIndices, UNPATCHED, 3925, 4034, 4134, 5028, 5558), - REGISTER_OOVPAS(D3DDevice_SetLight, PATCH, 3925, 4034, 4134, 5028, 5344, 5558), - REGISTER_OOVPAS(D3DDevice_SetMaterial, PATCH, 3925, 4034, 4134, 4627, 5344, 5455, 5558, 5659, 5788), // Was 4627 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetModelView, PATCH, 3925, 4134, 4627), - REGISTER_OOVPAS(D3DDevice_SetPalette, PATCH, 3925, 4034, 4134, 4432, 4627, 5233, 5344, 5558, 5788), - REGISTER_OOVPAS(D3DDevice_SetPixelShader, PATCH, 3925, 4039, 4134, 4432, 4627), - REGISTER_OOVPAS(D3DDevice_SetPixelShaderConstant, PATCH, 3925, 4039, 4831/*, 5233, 5558*/), - REGISTER_OOVPAS(D3DDevice_SetPixelShaderProgram, PATCH, 3925, 4361, 4627, 5558), - REGISTER_OOVPAS(D3DDevice_SetRenderState_BackFillMode, PATCH, 3925, 4034, 4134, 4531, 5788), + REGISTER_OOVPAS(D3DDevice_SetFlickerFilter, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetGammaRamp, PATCH, 3911, 4627), + REGISTER_OOVPAS(D3DDevice_SetIndices, UNPATCHED, 3911, 4034, 4134, 5028, 5558), + REGISTER_OOVPAS(D3DDevice_SetLight, PATCH, 3911, 4034, 4134, 5028, 5344, 5558), + REGISTER_OOVPAS(D3DDevice_SetMaterial, PATCH, 3911, 4034, 4134, 4627, 5344, 5455, 5558, 5659, 5788), // Was 4627 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetModelView, PATCH, 3911, 4134, 4627), + REGISTER_OOVPAS(D3DDevice_SetPalette, PATCH, 3911, 4034, 4134, 4432, 4627, 5233, 5344, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_SetPixelShader, PATCH, 3911, 4039, 4134, 4432, 4627), + REGISTER_OOVPAS(D3DDevice_SetPixelShaderConstant, PATCH, 3911, 4039, 4831/*, 5233, 5558*/), + REGISTER_OOVPAS(D3DDevice_SetPixelShaderProgram, PATCH, 3911, 4361, 4627, 5558), + REGISTER_OOVPAS(D3DDevice_SetRenderState_BackFillMode, PATCH, 3911, 4034, 4134, 4531, 5788), REGISTER_OOVPAS(D3DDevice_SetRenderState_CullMode, PATCH, 3911, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_Deferred, UNPATCHED, 3925), - REGISTER_OOVPAS(D3DDevice_SetRenderState_DoNotCullUncompressed, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_SetRenderState_Dxt1NoiseEnable, PATCH, 3925, 4034, 4134, 4627, 5028, 5344, 5558), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetRenderState_EdgeAntiAlias, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_FillMode, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_FogColor, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_FrontFace, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_LineWidth, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_LogicOp, PATCH, 3925, 4034, 4134, 4627), - REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleAntiAlias, PATCH, 3925, 4034, 4134, 4432, 4627), - REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMask, PATCH, 3925, 4034, 4134, 4627), + REGISTER_OOVPAS(D3DDevice_SetRenderState_Deferred, UNPATCHED, 3911), + REGISTER_OOVPAS(D3DDevice_SetRenderState_DoNotCullUncompressed, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_SetRenderState_Dxt1NoiseEnable, PATCH, 3911, 4034, 4134, 4627, 5028, 5344, 5558), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetRenderState_EdgeAntiAlias, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_FillMode, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_FogColor, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_FrontFace, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_LineWidth, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3DDevice_SetRenderState_LogicOp, PATCH, 3911, 4034, 4134, 4627), + REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleAntiAlias, PATCH, 3911, 4034, 4134, 4432, 4627), + REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMask, PATCH, 3911, 4034, 4134, 4627), REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleMode, PATCH, 3925, 4034, 4134, 4627, 5233, 5455, 5558, 5788), REGISTER_OOVPAS(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, PATCH, 4034, 4134, 4627, 5233, 5344, 5455, 5558, 5788), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetRenderState_NormalizeNormals, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_OcclusionCullEnable, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_PSTextureModes, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZCmpAlwaysRead, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZRead, PATCH, 3925), + REGISTER_OOVPAS(D3DDevice_SetRenderState_NormalizeNormals, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_OcclusionCullEnable, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3DDevice_SetRenderState_PSTextureModes, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZCmpAlwaysRead, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_SetRenderState_RopZRead, PATCH, 3911), REGISTER_OOVPAS(D3DDevice_SetRenderState_SampleAlpha, PATCH, 4627), - REGISTER_OOVPAS(D3DDevice_SetRenderState_ShadowFunc, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_Simple, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilCullEnable, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilEnable, PATCH, 3925, 4034, 4134, 5849), - REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilFail, PATCH, 3925, 4034, 4134, 5849), - REGISTER_OOVPAS(D3DDevice_SetRenderState_TextureFactor, PATCH, 3925, 4034, 4134, 5028, 5558, 5788), - REGISTER_OOVPAS(D3DDevice_SetRenderState_TwoSidedLighting, PATCH, 3925, 4034, 4134, 5344, 5558), // Beware of the typo... (from 4627's comment) - REGISTER_OOVPAS(D3DDevice_SetRenderState_VertexBlend, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_YuvEnable, PATCH, 3925, 4034, 4134), - REGISTER_OOVPAS(D3DDevice_SetRenderState_ZBias, PATCH, 3925), - REGISTER_OOVPAS(D3DDevice_SetRenderState_ZEnable, PATCH, 3925, 4034, 4134, 4432, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_SetRenderTarget, PATCH, 3925, 3948, 4039, 4134, 4627, 5344, 5455/*, 5558*/), + REGISTER_OOVPAS(D3DDevice_SetRenderState_ShadowFunc, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_Simple, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilCullEnable, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilEnable, PATCH, 3911, 4034, 4134, 5849), + REGISTER_OOVPAS(D3DDevice_SetRenderState_StencilFail, PATCH, 3911, 4034, 4134, 5849), + REGISTER_OOVPAS(D3DDevice_SetRenderState_TextureFactor, PATCH, 3911, 4034, 4134, 5028, 5558, 5788), + REGISTER_OOVPAS(D3DDevice_SetRenderState_TwoSidedLighting, PATCH, 3911, 4034, 4134, 5344, 5558), // Beware of the typo... (from 4627's comment) + REGISTER_OOVPAS(D3DDevice_SetRenderState_VertexBlend, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_YuvEnable, PATCH, 3911, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetRenderState_ZBias, PATCH, 3911), + REGISTER_OOVPAS(D3DDevice_SetRenderState_ZEnable, PATCH, 3911, 4034, 4134, 4432, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_SetRenderTarget, PATCH, 3911, 3948, 4039, 4134, 4627, 5344, 5455/*, 5558*/), REGISTER_OOVPAS(D3DDevice_SetRenderTargetFast, PATCH, 5233, 5344), - REGISTER_OOVPAS(D3DDevice_SetScissors, PATCH, 3925, 4039, 4361, 4627, 5233, 5344, 5558), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetScissors, PATCH, 3911, 4039, 4361, 4627, 5233, 5344, 5558), // Was 5233 (from 5344's comment) REGISTER_OOVPAS(D3DDevice_SetScreenSpaceOffset, PATCH, 4039, 5233, 5344, 5455), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetShaderConstantMode, PATCH, 3925, 4039, 4134, 4361, 4627, 5028), - REGISTER_OOVPAS(D3DDevice_SetSoftDisplayFilter, PATCH, 3925, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetShaderConstantMode, PATCH, 3911, 4039, 4134, 4361, 4627, 5028), + REGISTER_OOVPAS(D3DDevice_SetSoftDisplayFilter, PATCH, 3911, 4034, 4134), REGISTER_OOVPAS(D3DDevice_SetStateUP, UNPATCHED, 3911, 4627), REGISTER_OOVPAS(D3DDevice_SetStateVB, UNPATCHED, 3911, 4627), REGISTER_OOVPAS(D3DDevice_SetStipple, PATCH, 4627), - REGISTER_OOVPAS(D3DDevice_SetStreamSource, PATCH, 3925, 4034), + REGISTER_OOVPAS(D3DDevice_SetStreamSource, PATCH, 3911, 4034), REGISTER_OOVPAS(D3DDevice_SetSwapCallback, PATCH, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), - REGISTER_OOVPAS(D3DDevice_SetTexture, PATCH, 3925, 4034, 4627, 4831, 5344), // Was 4928 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetTextureState_BorderColor, PATCH, 3925, 4034, 4361), - REGISTER_OOVPAS(D3DDevice_SetTextureState_BumpEnv, PATCH, 3925, 4039), - REGISTER_OOVPAS(D3DDevice_SetTextureState_ColorKeyColor, PATCH, 3925, 4034, 4134), + REGISTER_OOVPAS(D3DDevice_SetTexture, PATCH, 3911, 4034, 4627, 4831, 5344), // Was 4928 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetTextureState_BorderColor, PATCH, 3911, 4034, 4361), + REGISTER_OOVPAS(D3DDevice_SetTextureState_BumpEnv, PATCH, 3911, 4039), + REGISTER_OOVPAS(D3DDevice_SetTextureState_ColorKeyColor, PATCH, 3911, 4034, 4134), REGISTER_OOVPAS(D3DDevice_SetTextureState_TexCoordIndex, PATCH, 3911, 4034, 4242, 4627), - REGISTER_OOVPAS(D3DDevice_SetTile, PATCH, 3925, 4039, 4134, 4627, 5028, 5455/*, 5788*/), // Then it has changed calls ?SetTileNoWait@D3D@@YGXKPBU_D3DTILE@@@Z in XDK 4627 and higher. - REGISTER_OOVPAS(D3DDevice_SetTransform, PATCH, 3925, 4034, 4134, 5344, 5558), // Was 4134 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetVertexData2f, PATCH, 3925, 4039), // Was 4627 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetVertexData2s, PATCH, 3925, 4134, 4361), - REGISTER_OOVPAS(D3DDevice_SetVertexData4f, PATCH, 3925, 4039), - REGISTER_OOVPAS(D3DDevice_SetVertexData4s, PATCH, 3925, 4134, 4361), - REGISTER_OOVPAS(D3DDevice_SetVertexData4ub, PATCH, 3925, 4134), - REGISTER_OOVPAS(D3DDevice_SetVertexDataColor, PATCH, 3925, 4039, 4361), - REGISTER_OOVPAS(D3DDevice_SetVertexShader, PATCH, 3925, 4034, 4134, 5028, 5455), - REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant, PATCH, 3925, 4034, 4627), + REGISTER_OOVPAS(D3DDevice_SetTile, PATCH, 3911, 4039, 4134, 4627, 5028, 5455/*, 5788*/), // Then it has changed calls ?SetTileNoWait@D3D@@YGXKPBU_D3DTILE@@@Z in XDK 4627 and higher. + REGISTER_OOVPAS(D3DDevice_SetTransform, PATCH, 3911, 4034, 4134, 5344, 5558), // Was 4134 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetVertexData2f, PATCH, 3911, 4039), // Was 4627 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetVertexData2s, PATCH, 3911, 4134, 4361), + REGISTER_OOVPAS(D3DDevice_SetVertexData4f, PATCH, 3911, 4039), + REGISTER_OOVPAS(D3DDevice_SetVertexData4s, PATCH, 3911, 4134, 4361), + REGISTER_OOVPAS(D3DDevice_SetVertexData4ub, PATCH, 3911, 4134), + REGISTER_OOVPAS(D3DDevice_SetVertexDataColor, PATCH, 3911, 4039, 4361), + REGISTER_OOVPAS(D3DDevice_SetVertexShader, PATCH, 3911, 4034, 4134, 5028, 5455), + REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant, PATCH, 3911, 4034, 4627), REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant1, PATCH, 4627, 5558, 5788), REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant1Fast, PATCH, 4627), REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstant4, PATCH, 4627), REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstantNotInline, PATCH, 4627, 5028, 5558), REGISTER_OOVPAS(D3DDevice_SetVertexShaderConstantNotInlineFast, PATCH, 4627), - REGISTER_OOVPAS(D3DDevice_SetVertexShaderInput, PATCH, 3925, 4134, 4361), + REGISTER_OOVPAS(D3DDevice_SetVertexShaderInput, PATCH, 3911, 4134, 4361), REGISTER_OOVPAS(D3DDevice_SetVertexShaderInputDirect, PATCH, 4361), - REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3925, 4039, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(D3DDevice_SetViewport, PATCH, 3925, 4034, 4627, 5028, 5344, 5455), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetVerticalBlankCallback, PATCH, 3911, 4039, 4134, 4242, 4432, 4627, 5028, 5233, 5344, 5455, 5558, 5659), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(D3DDevice_SetViewport, PATCH, 3911, 4034, 4627, 5028, 5344, 5455), // Was 5233 (from 5344's comment) REGISTER_OOVPAS(D3DDevice_Swap, PATCH, 4034, 4531, 4627, 5028, 5233), - REGISTER_OOVPAS(D3DDevice_SwitchTexture, PATCH, 3925, 4361), + REGISTER_OOVPAS(D3DDevice_SwitchTexture, PATCH, 3911, 4361), REGISTER_OOVPAS(D3DDevice_UpdateOverlay, PATCH, 3911, 4531,/* 5028,*/ 5233/*, 5344, 5558*/), - REGISTER_OOVPAS(D3DPalette_Lock, PATCH, 3925, 4531, 4627, 5344), // Called D3DPalette_Lock2 (from 4627's comment) NOTE: Use D3DPalette_Lock2 for 4627 and above + REGISTER_OOVPAS(D3DPalette_Lock, PATCH, 3911, 4531, 4627, 5344), // Called D3DPalette_Lock2 (from 4627's comment) NOTE: Use D3DPalette_Lock2 for 4627 and above REGISTER_OOVPAS(D3DPalette_Lock2, PATCH, 4627), - REGISTER_OOVPAS(D3DResource_AddRef, PATCH, 3925), - REGISTER_OOVPAS(D3DResource_BlockUntilNotBusy, PATCH, 3925), - REGISTER_OOVPAS(D3DResource_GetType, UNPATCHED, 3925, 4034), // Probably not even necessary... (from 3925's comment) // I forget why I had this in here... (from 5028's comment) - REGISTER_OOVPAS(D3DResource_IsBusy, PATCH, 3925, 4039), - REGISTER_OOVPAS(D3DResource_Register, PATCH, 3925), - REGISTER_OOVPAS(D3DResource_Release, PATCH, 3925, 4361), - REGISTER_OOVPAS(D3DSurface_GetDesc, PATCH, 3925), - REGISTER_OOVPAS(D3DSurface_LockRect, PATCH, 3925), - REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel, PATCH, 3925, 4432, 4627), + REGISTER_OOVPAS(D3DResource_AddRef, PATCH, 3911), + REGISTER_OOVPAS(D3DResource_BlockUntilNotBusy, PATCH, 3911), + REGISTER_OOVPAS(D3DResource_GetType, UNPATCHED, 3911, 4034), // Probably not even necessary... (from 3925's comment) // I forget why I had this in here... (from 5028's comment) + REGISTER_OOVPAS(D3DResource_IsBusy, PATCH, 3911, 4039), + REGISTER_OOVPAS(D3DResource_Register, PATCH, 3911), + REGISTER_OOVPAS(D3DResource_Release, PATCH, 3911, 4361), + REGISTER_OOVPAS(D3DSurface_GetDesc, PATCH, 3911), + REGISTER_OOVPAS(D3DSurface_LockRect, PATCH, 3911), + REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel, PATCH, 3911, 4432, 4627), REGISTER_OOVPAS(D3DTexture_GetSurfaceLevel2, PATCH, 4627), - REGISTER_OOVPAS(D3DTexture_LockRect, PATCH, 3925), - REGISTER_OOVPAS(D3DVertexBuffer_GetDesc, UNPATCHED, 3925), - REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3925, 4034, 4531, 4627, 5788), + REGISTER_OOVPAS(D3DTexture_LockRect, PATCH, 3911), + REGISTER_OOVPAS(D3DVertexBuffer_GetDesc, UNPATCHED, 3911), + REGISTER_OOVPAS(D3DVertexBuffer_Lock, PATCH, 3911, 4034, 4531, 4627, 5788), REGISTER_OOVPAS(D3DVertexBuffer_Lock2, PATCH, 4627, 5788), - REGISTER_OOVPAS(D3DVolumeTexture_LockBox, PATCH, 3925), // Just calls Lock3DSurface (from 4134, 4432's comment) - REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3925, 5788), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment) - REGISTER_OOVPAS(D3D_BlockOnResource, PATCH, 3925, 4034), - REGISTER_OOVPAS(D3D_BlockOnTime, PATCH, 3925, 4039, 4361, 4627, 5028, 5558, 5849), + REGISTER_OOVPAS(D3DVolumeTexture_LockBox, PATCH, 3911), // Just calls Lock3DSurface (from 4134, 4432's comment) + REGISTER_OOVPAS(D3D_AllocContiguousMemory, UNPATCHED, 3911, 5788), // Just calls MmAllocateContiguousMemory. Was PATCH (from 3925, 5788's comment) + REGISTER_OOVPAS(D3D_BlockOnResource, PATCH, 3911, 4034), + REGISTER_OOVPAS(D3D_BlockOnTime, PATCH, 3911, 4039, 4361, 4627, 5028, 5558, 5849), REGISTER_OOVPAS(D3D_CMiniport_GetDisplayCapabilities, PATCH, 3911), REGISTER_OOVPAS(D3D_CheckDeviceFormat, UNPATCHED, 3911, 4134), REGISTER_OOVPAS(D3D_ClearStateBlockFlags, XREF, 3911, 5788), @@ -343,23 +343,23 @@ OOVPATable D3D8_OOVPAV2[] = { REGISTER_OOVPAS(D3D_CommonSetRenderTargetB, XREF, 4627), REGISTER_OOVPAS(D3D_CreateDeviceX, UNPATCHED, 4627), REGISTER_OOVPAS(D3D_CreateStandAloneSurface, XREF, 4134), - REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3925), - REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3925), - REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3925, 4034, 4627, 5028), + REGISTER_OOVPAS(D3D_GetAdapterIdentifier, UNPATCHED, 3911), + REGISTER_OOVPAS(D3D_GetDeviceCaps, UNPATCHED, 3911), + REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle, PATCH, 3911, 4034, 4627, 5028), REGISTER_OOVPAS(D3D_KickOffAndWaitForIdle2, PATCH, 4627), REGISTER_OOVPAS(D3D_LazySetPointParams, PATCH, 3911, 4039), REGISTER_OOVPAS(D3D_RecordStateBlock, XREF, 3911, 5788), - REGISTER_OOVPAS(D3D_SetCommonDebugRegisters, PATCH, 3925), - REGISTER_OOVPAS(D3D_SetFence, XREF, 3925, 4039, 4134, 5028, 5558), + REGISTER_OOVPAS(D3D_SetCommonDebugRegisters, PATCH, 3911), + REGISTER_OOVPAS(D3D_SetFence, XREF, 3911, 4039, 4134, 5028, 5558), REGISTER_OOVPAS(D3D_SetPushBufferSize, UNPATCHED, 3911), REGISTER_OOVPAS(D3D_Unknown, XREF, 5788), REGISTER_OOVPAS(Direct3D_CheckDeviceMultiSampleType, UNPATCHED, 3911), REGISTER_OOVPAS(Direct3D_CreateDevice, PATCH, 3911, 5028), - REGISTER_OOVPAS(Get2DSurfaceDesc, PATCH, 3925, 4034, 4134, 4627, 5028, 5344, 5558, 5788, 5849), // Was 5233 (from 5344's comment) - REGISTER_OOVPAS(Lock2DSurface, PATCH, 3925), + REGISTER_OOVPAS(Get2DSurfaceDesc, PATCH, 3911, 4034, 4134, 4627, 5028, 5344, 5558, 5788, 5849), // Was 5233 (from 5344's comment) + REGISTER_OOVPAS(Lock2DSurface, PATCH, 3911), REGISTER_OOVPAS(Lock3DSurface, PATCH, 3911), REGISTER_OOVPAS(D3D_MakeRequestedSpace, PATCH, 4134, 5028, 5558, 5788), - REGISTER_OOVPAS(XMETAL_StartPush, UNPATCHED, 3925), + REGISTER_OOVPAS(XMETAL_StartPush, UNPATCHED, 3911), }; // ******************************************************************