diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl index d8454efbd..35deea8b5 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.3925.inl @@ -4179,6 +4179,29 @@ SOOVPA<7> D3DDevice_LoadVertexShaderProgram_1_0_3925 = } }; +// ****************************************************************** +// * D3DDevice_DeleteVertexShader +// ****************************************************************** +SOOVPA<6> X_D3DDevice_DeleteVertexShader_1_0_3925 = +{ + 0, // Large == 0 + 6, // Count == 6 + + -1, // Xref Not Saved + 0, // Xref Not Used + + { + { 0x02, 0x24 }, + { 0x06, 0xFF }, + { 0x0A, 0x08 }, + { 0x0E, 0x44 }, + + // D3DDevice_DeleteVertexShader+0x16 : retn 4 + { 0x16, 0xC2 }, + { 0x17, 0x04 }, + } +}; + // ****************************************************************** // * D3DDevice_RunPushBuffer // ****************************************************************** @@ -5801,6 +5824,16 @@ OOVPATable D3D8_1_0_3925[] = #ifdef _DEBUG_TRACE "EmuIDirect3DDevice8_LoadVertexShaderProgram" #endif + }, + // D3DDevice_DeleteVertexShader + { + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, + + XTL::EmuIDirect3DDevice8_DeleteVertexShader, + + #ifdef _DEBUG_TRACE + "EmuIDirect3DDevice8_DeleteVertexShader" + #endif }, // IDirect3DDevice8::RunPushBuffer { diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl index 0c064e30d..187d93037 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl @@ -2359,6 +2359,16 @@ OOVPATable D3D8_1_0_4034[] = #ifdef _DEBUG_TRACE "EmuIDirect3DDevice8_LoadVertexShader" #endif + }, + // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) + { + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, + + XTL::EmuIDirect3DDevice8_DeleteVertexShader, + + #ifdef _DEBUG_TRACE + "EmuIDirect3DDevice8_DeleteVertexShader" + #endif }, // D3DDevice_DrawRectPatch { diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl index 434112567..7afd61af6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl @@ -1933,27 +1933,6 @@ SOOVPA<13> IDirect3DDevice8_SetRenderState_CullModeB_1_0_4134 = } }; -// ****************************************************************** -// * D3DDevice_DeleteVertexShader -// ****************************************************************** -SOOVPA<6> X_D3DDevice_DeleteVertexShader_1_0_4134 = -{ - 0, // Large == 0 - 6, // Count == 6 - - -1, // Xref Not Saved - 0, // Xref Not Used - - { - { 0x02, 0x24 }, - { 0x06, 0xFF }, - { 0x0A, 0x08 }, - { 0x0E, 0x44 }, - { 0x16, 0xC2 }, - { 0x17, 0x04 }, - } -}; - // ****************************************************************** // * IDirect3DDevice8_SetScreenSpaceOffset // ****************************************************************** @@ -3621,9 +3600,9 @@ OOVPATable D3D8_1_0_4134[] = "EmuIDirect3DDevice8_SetRenderState_CullModeB" #endif }, - // D3DDevice_DeleteVertexShader (* unchanged since 4134 *) + // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) { - (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_4134, + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl index 0762c653e..a9ceffd1d 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4361.inl @@ -3374,9 +3374,9 @@ OOVPATable D3D8_1_0_4361[] = "EmuIDirect3DDevice8_SetRenderState_CullModeB" #endif }, - // D3DDevice_DeleteVertexShader (* unchanged since 4134 *) + // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) { - (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_4134, + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl index 6d620b0dd..5962f00d6 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4432.inl @@ -1597,9 +1597,9 @@ OOVPATable D3D8_1_0_4432[] = "EmuIDirect3DDevice8_SetRenderState_CullModeB" #endif }, - // D3DDevice_DeleteVertexShader (* unchanged since 4134 *) + // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) { - (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_4134, + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl index c29dae565..6d437a642 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.4627.inl @@ -5360,9 +5360,9 @@ OOVPATable D3D8_1_0_4627[] = "EmuIDirect3DDevice8_GetViewportOffsetAndScale" #endif }, - // D3DDevice_DeleteVertexShader (* unchanged since 4134 *) + // D3DDevice_DeleteVertexShader (* unchanged since 3925 *) { - (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_4134, + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader, diff --git a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl index f65050fa0..388952da7 100644 --- a/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl +++ b/src/CxbxKrnl/HLEDataBase/D3D8.1.0.5233.inl @@ -3192,9 +3192,9 @@ OOVPATable D3D8_1_0_5233[] = "EmuIDirect3DDevice8_GetViewportOffsetAndScale" #endif }, - // IDirect3DDevice8::DeleteVertexShader (* unchanged since 4134 *) + // IDirect3DDevice8::DeleteVertexShader (* unchanged since 3925 *) { - (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_4134, + (OOVPA*)&X_D3DDevice_DeleteVertexShader_1_0_3925, XTL::EmuIDirect3DDevice8_DeleteVertexShader,