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

Added XDK 3911 OOVPAs for Xapi. 

- XGetDevices, moved back from 4034
- XID_fCloseDevice
- XInputClose, moved back from 4361
- XInputGetCapabilities

Added XDK 3925 OOVPAs for D3D8.
- IDirect3DDevice8_CreatePixelShader
- IDirect3DDevice8_SetPixelShader (disabled existing)
- IDirect3DDevice8_GetRenderTarget
- IDirect3DSurface8_LockRect, moved back from 4361

Added XDK 5233 OOVPAs for D3D8.
- IDirect3DResource8_IsBusy, reused from 4361
- IDirect3DTexture8_LockRect, moved back from 5558
- Lock2DSurface, reused from 3925

Removed XG 5233/5558 XGUnswizzleRect OOVPAs. Not intended for HLE, caused stack corruption.

Convert PC D3DFMT_L8 to 0x13 (linear).
This commit is contained in:
Daniel Stien 2008-09-22 01:08:25 +00:00
parent 26861248d2
commit 18bcc2160c
13 changed files with 427 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CxbxKrnl/EmuD3D8/Convert.cpp
View File

@ -213,6 +213,9 @@ XTL::X_D3DFORMAT XTL::EmuPC2XB_D3DFormat(D3DFORMAT Format)
case D3DFMT_A4R4G4B4: case D3DFMT_A4R4G4B4:
return 0x1D; // Linear return 0x1D; // Linear
// return 0x04; // Swizzled // return 0x04; // Swizzled
case D3DFMT_L8:
return 0x13; // Linear
// return 0x00; // Swizzled
} }
CxbxKrnlCleanup("EmuPC2XB_D3DFormat: Unknown Format (%d)", Format); CxbxKrnlCleanup("EmuPC2XB_D3DFormat: Unknown Format (%d)", Format);

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

@ -506,6 +506,73 @@ SOOVPA<14> IDirect3DDevice8_SetVertexShader_1_0_3925 =
} }
}; };
// ******************************************************************
// * IDirect3DDevice8_CreatePixelShader
// ******************************************************************
SOOVPA<11> IDirect3DDevice8_CreatePixelShader_1_0_3925 =
{
0, // Large == 0
11, // Count == 11
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DDevice8_CreatePixelShader+0x00 : push 0xFC
{ 0x00, 0x68 }, // (Offset,Value)-Pair #1
{ 0x01, 0xFC }, // (Offset,Value)-Pair #2
// IDirect3DDevice8_CreatePixelShader+0x10 : mov eax, 0x8007000E
{ 0x10, 0xB8 }, // (Offset,Value)-Pair #3
{ 0x11, 0x0E }, // (Offset,Value)-Pair #4
{ 0x12, 0x00 }, // (Offset,Value)-Pair #5
{ 0x13, 0x07 }, // (Offset,Value)-Pair #6
{ 0x14, 0x80 }, // (Offset,Value)-Pair #7
// IDirect3DDevice8_CreatePixelShader+0x31 : mov ecx, 0x3C
{ 0x31, 0xB9 }, // (Offset,Value)-Pair #8
{ 0x32, 0x3C }, // (Offset,Value)-Pair #9
// IDirect3DDevice8_CreatePixelShader+0x42 : retn 0x08
{ 0x42, 0xC2 }, // (Offset,Value)-Pair #10
{ 0x43, 0x08 }, // (Offset,Value)-Pair #11
}
};
// ******************************************************************
// * IDirect3DDevice8_SetPixelShader
// ******************************************************************
SOOVPA<10> IDirect3DDevice8_SetPixelShader_1_0_3925 =
{
0, // Large == 0
10, // Count == 10
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DDevice8_SetPixelShader+0x0E : mov esi, [ebx+0x0414]
{ 0x0E, 0x8B }, // (Offset,Value)-Pair #1
{ 0x0F, 0xB3 }, // (Offset,Value)-Pair #2
{ 0x10, 0x14 }, // (Offset,Value)-Pair #3
{ 0x11, 0x04 }, // (Offset,Value)-Pair #4
// IDirect3DDevice8_SetPixelShader+0x34 : or eax, 0x40
{ 0x35, 0xC8 }, // (Offset,Value)-Pair #5
{ 0x36, 0x40 }, // (Offset,Value)-Pair #6
// IDirect3DDevice8_SetPixelShader+0x68 : retn 0x04
{ 0x68, 0xC2 }, // (Offset,Value)-Pair #7
{ 0x69, 0x04 }, // (Offset,Value)-Pair #8
// IDirect3DDevice8_SetPixelShader+0xE3 : rep movsd
{ 0xE3, 0xF3 }, // (Offset,Value)-Pair #9
{ 0xE4, 0xA5 }, // (Offset,Value)-Pair #10
}
};
/* FIXME: Is this correct?
// ****************************************************************** // ******************************************************************
// * IDirect3DDevice8_SetPixelShader // * IDirect3DDevice8_SetPixelShader
// ****************************************************************** // ******************************************************************
@ -537,6 +604,7 @@ SOOVPA<12> IDirect3DDevice8_SetPixelShader_1_0_3925 =
{ 0x35, 0x04 }, // (Offset,Value)-Pair #12 { 0x35, 0x04 }, // (Offset,Value)-Pair #12
} }
}; };
//*/
// ****************************************************************** // ******************************************************************
// * IDirect3DDevice8_SetIndices // * IDirect3DDevice8_SetIndices
@ -1813,6 +1881,37 @@ SOOVPA<12> IDirect3DDevice8_GetBackBuffer_1_0_3925 =
} }
}; };
// ******************************************************************
// * IDirect3DDevice8_GetRenderTarget
// ******************************************************************
SOOVPA<9> IDirect3DDevice8_GetRenderTarget_1_0_3925 =
{
0, // Large == 0
9, // Count == 9
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DDevice8_GetRenderTarget+0x00 : mov eax, [addr]
{ 0x00, 0xA1 }, // (Offset,Value)-Pair #1
// IDirect3DDevice8_GetRenderTarget+0x05 : mov eax, [eax + 0x040C]
{ 0x05, 0x8B }, // (Offset,Value)-Pair #2
{ 0x06, 0x80 }, // (Offset,Value)-Pair #3
{ 0x07, 0x0C }, // (Offset,Value)-Pair #4
{ 0x08, 0x04 }, // (Offset,Value)-Pair #5
// IDirect3DDevice8_GetRenderTarget+0x11 : mov [ecx], eax
{ 0x11, 0x89 }, // (Offset,Value)-Pair #6
{ 0x12, 0x01 }, // (Offset,Value)-Pair #7
// IDirect3DDevice8_GetRenderTarget+0x1D : retn 0x04
{ 0x1D, 0xC2 }, // (Offset,Value)-Pair #8
{ 0x1E, 0x04 }, // (Offset,Value)-Pair #9
}
};
// ****************************************************************** // ******************************************************************
// * IDirect3DDevice8_GetDepthStencilSurface // * IDirect3DDevice8_GetDepthStencilSurface
// ****************************************************************** // ******************************************************************
@ -2064,6 +2163,48 @@ SOOVPA<11> IDirect3DResource8_IsBusy_1_0_3925 =
} }
}; };
// ******************************************************************
// * IDirect3DSurface8_LockRect
// ******************************************************************
SOOVPA<16> IDirect3DSurface8_LockRect_1_0_3925 =
{
0, // Large == 0
16, // Count == 16
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DSurface8_LockRect+0x00 : mov eax, [esp+0x10]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #1
{ 0x01, 0x44 }, // (Offset,Value)-Pair #2
{ 0x02, 0x24 }, // (Offset,Value)-Pair #3
{ 0x03, 0x10 }, // (Offset,Value)-Pair #4
// IDirect3DSurface8_LockRect+0x04 : mov ecx, [esp+0x0C]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #5
{ 0x05, 0x4C }, // (Offset,Value)-Pair #6
{ 0x06, 0x24 }, // (Offset,Value)-Pair #7
{ 0x07, 0x0C }, // (Offset,Value)-Pair #8
// IDirect3DSurface8_LockRect+0x0C : push eax
{ 0x0C, 0x50 }, // (Offset,Value)-Pair #9
// IDirect3DSurface8_LockRect+0x11 : push ecx; push edx; push 0; push 0
{ 0x11, 0x51 }, // (Offset,Value)-Pair #10
{ 0x12, 0x52 }, // (Offset,Value)-Pair #11
{ 0x13, 0x6A }, // (Offset,Value)-Pair #12
{ 0x15, 0x6A }, // (Offset,Value)-Pair #13
// IDirect3DSurface8_LockRect+0x18 : call [abs]
{ 0x18, 0xE8 }, // (Offset,Value)-Pair #14
// IDirect3DSurface8_LockRect+0x11 : retn 0x10
{ 0x1D, 0xC2 }, // (Offset,Value)-Pair #15
{ 0x1E, 0x10 }, // (Offset,Value)-Pair #16
}
};
// ****************************************************************** // ******************************************************************
// * IDirect3DPalette8_Lock // * IDirect3DPalette8_Lock
// ****************************************************************** // ******************************************************************
@ -2493,6 +2634,16 @@ OOVPATable D3D8_1_0_3925[] =
"EmuIDirect3DDevice8_SetVertexShader" "EmuIDirect3DDevice8_SetVertexShader"
#endif #endif
}, },
// IDirect3DDevice8::CreatePixelShader
{
(OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_3925,
XTL::EmuIDirect3DDevice8_CreatePixelShader,
#ifdef _DEBUG_TRACE
"EmuIDirect3DDevice8_CreatePixelShader"
#endif
},
// IDirect3DDevice8::SetPixelShader // IDirect3DDevice8::SetPixelShader
{ {
(OOVPA*)&IDirect3DDevice8_SetPixelShader_1_0_3925, (OOVPA*)&IDirect3DDevice8_SetPixelShader_1_0_3925,
@ -2873,6 +3024,16 @@ OOVPATable D3D8_1_0_3925[] =
"EmuIDirect3DDevice8_GetBackBuffer" "EmuIDirect3DDevice8_GetBackBuffer"
#endif #endif
}, },
// IDirect3DDevice8::GetRenderTarget
{
(OOVPA*)&IDirect3DDevice8_GetRenderTarget_1_0_3925,
XTL::EmuIDirect3DDevice8_GetRenderTarget,
#ifdef _DEBUG_TRACE
"EmuIDirect3DDevice8_GetRenderTarget"
#endif
},
// IDirect3DDevice8::GetDepthStencilSurface // IDirect3DDevice8::GetDepthStencilSurface
{ {
(OOVPA*)&IDirect3DDevice8_GetDepthStencilSurface_1_0_3925, (OOVPA*)&IDirect3DDevice8_GetDepthStencilSurface_1_0_3925,
@ -2943,6 +3104,16 @@ OOVPATable D3D8_1_0_3925[] =
"EmuIDirect3DResource8_IsBusy" "EmuIDirect3DResource8_IsBusy"
#endif #endif
}, },
// IDirect3DSurface8::LockRect
{
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect,
#ifdef _DEBUG_TRACE
"EmuIDirect3DSurface8_LockRect"
#endif
},
// IDirect3DPalette8::Lock // IDirect3DPalette8::Lock
{ {
(OOVPA*)&IDirect3DPalette8_Lock_1_0_3925, (OOVPA*)&IDirect3DPalette8_Lock_1_0_3925,

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

@ -700,39 +700,6 @@ SOOVPA<10> IDirect3DDevice8_SetVertexShaderConstant_1_0_4361 =
} }
}; };
// ******************************************************************
// * IDirect3DDevice8_CreatePixelShader
// ******************************************************************
SOOVPA<11> IDirect3DDevice8_CreatePixelShader_1_0_4361 =
{
0, // Large == 0
11, // Count == 11
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DDevice8_CreatePixelShader+0x00 : push 0xFC
{ 0x00, 0x68 }, // (Offset,Value)-Pair #1
{ 0x01, 0xFC }, // (Offset,Value)-Pair #2
// IDirect3DDevice8_CreatePixelShader+0x10 : mov eax, 0x8007000E
{ 0x10, 0xB8 }, // (Offset,Value)-Pair #3
{ 0x11, 0x0E }, // (Offset,Value)-Pair #4
{ 0x12, 0x00 }, // (Offset,Value)-Pair #5
{ 0x13, 0x07 }, // (Offset,Value)-Pair #6
{ 0x14, 0x80 }, // (Offset,Value)-Pair #7
// IDirect3DDevice8_CreatePixelShader+0x31 : mov ecx, 0x3C
{ 0x31, 0xB9 }, // (Offset,Value)-Pair #8
{ 0x32, 0x3C }, // (Offset,Value)-Pair #9
// IDirect3DDevice8_CreatePixelShader+0x42 : retn 0x08
{ 0x42, 0xC2 }, // (Offset,Value)-Pair #10
{ 0x43, 0x08 }, // (Offset,Value)-Pair #11
}
};
// ****************************************************************** // ******************************************************************
// * IDirect3DDevice8_SetPixelShader // * IDirect3DDevice8_SetPixelShader
// ****************************************************************** // ******************************************************************
@ -1930,54 +1897,6 @@ SOOVPA<15> IDirect3DSurface8_GetDesc_1_0_4361 =
} }
}; };
// ******************************************************************
// * IDirect3DSurface8_LockRect
// ******************************************************************
SOOVPA<16> IDirect3DSurface8_LockRect_1_0_4361 =
{
0, // Large == 0
16, // Count == 16
-1, // XRef Not Saved
0, // XRef Not Used
{
// IDirect3DSurface8_LockRect+0x00 : mov eax, [esp+0x10]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #1
{ 0x01, 0x44 }, // (Offset,Value)-Pair #2
{ 0x02, 0x24 }, // (Offset,Value)-Pair #3
{ 0x03, 0x10 }, // (Offset,Value)-Pair #4
// IDirect3DSurface8_LockRect+0x04 : mov ecx, [esp+0x0C]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #5
{ 0x05, 0x4C }, // (Offset,Value)-Pair #6
{ 0x06, 0x24 }, // (Offset,Value)-Pair #7
{ 0x07, 0x0C }, // (Offset,Value)-Pair #8
// IDirect3DSurface8_LockRect+0x0C : push eax
{ 0x0C, 0x50 }, // (Offset,Value)-Pair #9
// IDirect3DSurface8_LockRect+0x11 : push ecx
{ 0x11, 0x51 }, // (Offset,Value)-Pair #10
// IDirect3DSurface8_LockRect+0x12 : push edx
{ 0x12, 0x52 }, // (Offset,Value)-Pair #11
// IDirect3DSurface8_LockRect+0x13 : push 0
{ 0x13, 0x6A }, // (Offset,Value)-Pair #12
// IDirect3DSurface8_LockRect+0x15 : push 0
{ 0x15, 0x6A }, // (Offset,Value)-Pair #13
// IDirect3DSurface8_LockRect+0x18 : call [abs]
{ 0x18, 0xE8 }, // (Offset,Value)-Pair #14
// IDirect3DSurface8_LockRect+0x11 : retn 0x08
{ 0x1D, 0xC2 }, // (Offset,Value)-Pair #15
{ 0x1E, 0x10 }, // (Offset,Value)-Pair #16
}
};
// ****************************************************************** // ******************************************************************
// * IDirect3DBaseTexture8_GetLevelCount // * IDirect3DBaseTexture8_GetLevelCount
// ****************************************************************** // ******************************************************************
@ -2274,9 +2193,9 @@ OOVPATable D3D8_1_0_4361[] =
"EmuIDirect3DDevice8_SetVertexShaderConstant" "EmuIDirect3DDevice8_SetVertexShaderConstant"
#endif #endif
}, },
// IDirect3DDevice8::CreatePixelShader // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_4361, (OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_3925,
XTL::EmuIDirect3DDevice8_CreatePixelShader, XTL::EmuIDirect3DDevice8_CreatePixelShader,
@ -2714,9 +2633,9 @@ OOVPATable D3D8_1_0_4361[] =
"EmuIDirect3DSurface8_GetDesc" "EmuIDirect3DSurface8_GetDesc"
#endif #endif
}, },
// IDirect3DSurface8::LockRect // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

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

@ -1851,9 +1851,9 @@ OOVPATable D3D8_1_0_4432[] =
"EmuIDirect3DPalette8_Lock" "EmuIDirect3DPalette8_Lock"
#endif #endif
}, },
// IDirect3DSurface8::LockRect (* unchanged since 4361 *) // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

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

@ -3490,9 +3490,9 @@ OOVPATable D3D8_1_0_4627[] =
"EmuIDirect3DDevice8_DeletePixelShader" "EmuIDirect3DDevice8_DeletePixelShader"
#endif #endif
}, },
// IDirect3DDevice8::CreatePixelShader (* unchanged since 4361 *) // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_4361, (OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_3925,
XTL::EmuIDirect3DDevice8_CreatePixelShader, XTL::EmuIDirect3DDevice8_CreatePixelShader,
@ -4280,9 +4280,9 @@ OOVPATable D3D8_1_0_4627[] =
"EmuIDirect3DSurface8_GetDesc" "EmuIDirect3DSurface8_GetDesc"
#endif #endif
}, },
// IDirect3DSurface8::LockRect (* unchanged since 4361 *) // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

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

@ -522,6 +522,28 @@ SOOVPA<13> IDirect3DPalette8_Lock2_1_0_5233 =
} }
}; };
// ******************************************************************
// * IDirect3DTexture8_LockRect
// ******************************************************************
SOOVPA<17> IDirect3DTexture8_LockRect_1_0_5233 =
{
0, // Large == 0
7, // Count == 7
-1, // Xref Not Saved
0, // Xref Not Used
{
{ 0x03, 0x14 },
{ 0x08, 0x8B },
{ 0x0D, 0x8B },
{ 0x12, 0x8B },
{ 0x17, 0x50 },
{ 0x20, 0xC2 },
{ 0x21, 0x14 },
}
};
// ****************************************************************** // ******************************************************************
// * Get2DSurfaceDesc // * Get2DSurfaceDesc
// ****************************************************************** // ******************************************************************
@ -1520,9 +1542,9 @@ OOVPATable D3D8_1_0_5233[] =
"EmuIDirect3DDevice8_DeletePixelShader" "EmuIDirect3DDevice8_DeletePixelShader"
#endif #endif
}, },
// IDirect3DDevice8::CreatePixelShader (* unchanged since 4361 *) // IDirect3DDevice8::CreatePixelShader (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_4361, (OOVPA*)&IDirect3DDevice8_CreatePixelShader_1_0_3925,
XTL::EmuIDirect3DDevice8_CreatePixelShader, XTL::EmuIDirect3DDevice8_CreatePixelShader,
@ -2160,6 +2182,16 @@ OOVPATable D3D8_1_0_5233[] =
"EmuIDirect3DResource8_Release" "EmuIDirect3DResource8_Release"
#endif #endif
}, },
// IDirect3DResource8::IsBusy (* unchanged since 4361 *)
{
(OOVPA*)&IDirect3DResource8_IsBusy_1_0_4361,
XTL::EmuIDirect3DResource8_IsBusy,
#ifdef _DEBUG_TRACE
"EmuIDirect3DResource8_IsBusy"
#endif
},
// IDirect3DPalette8::Lock2 // IDirect3DPalette8::Lock2
{ {
(OOVPA*)&IDirect3DPalette8_Lock2_1_0_5233, (OOVPA*)&IDirect3DPalette8_Lock2_1_0_5233,
@ -2170,6 +2202,26 @@ OOVPATable D3D8_1_0_5233[] =
"EmuIDirect3DPalette8_Lock2" "EmuIDirect3DPalette8_Lock2"
#endif #endif
}, },
// IDirect3DTexture8::LockRect
{
(OOVPA*)&IDirect3DTexture8_LockRect_1_0_5233,
XTL::EmuIDirect3DTexture8_LockRect,
#ifdef _DEBUG_TRACE
"EmuIDirect3DTexture8_LockRect"
#endif
},
// Lock2DSurface (* unchanged since 3925 *)
{
(OOVPA*)&Lock2DSurface_1_0_3925,
XTL::EmuLock2DSurface,
#ifdef _DEBUG_TRACE
"EmuLock2DSurface"
#endif
},
// Get2DSurfaceDesc // Get2DSurfaceDesc
{ {
(OOVPA*)&Get2DSurfaceDesc_1_0_5233, (OOVPA*)&Get2DSurfaceDesc_1_0_5233,
@ -2190,9 +2242,9 @@ OOVPATable D3D8_1_0_5233[] =
"EmuIDirect3DSurface8_GetDesc" "EmuIDirect3DSurface8_GetDesc"
#endif #endif
}, },
// IDirect3DSurface8::LockRect (* unchanged since 4361 *) // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

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

@ -595,28 +595,6 @@ SOOVPA<12> IDirect3DDevice8_GetBackBuffer2_1_0_5558 =
} }
}; };
// ******************************************************************
// * IDirect3DTexture8_LockRect
// ******************************************************************
SOOVPA<17> IDirect3DTexture8_LockRect_1_0_5558 =
{
0, // Large == 0
7, // Count == 7
-1, // Xref Not Saved
0, // Xref Not Used
{
{ 0x03, 0x14 },
{ 0x08, 0x8B },
{ 0x0D, 0x8B },
{ 0x12, 0x8B },
{ 0x17, 0x50 },
{ 0x20, 0xC2 },
{ 0x21, 0x14 },
}
};
// ****************************************************************** // ******************************************************************
// * IDirect3D8_CheckDeviceMultiSampleType // * IDirect3D8_CheckDeviceMultiSampleType
// ****************************************************************** // ******************************************************************
@ -1417,9 +1395,9 @@ OOVPATable D3D8_1_0_5558[] =
"EmuIDirect3DPalette8_Lock2" "EmuIDirect3DPalette8_Lock2"
#endif #endif
}, },
// IDirect3DTexture8::LockRect // IDirect3DTexture8::LockRect (* unchanged since 5233 *)
{ {
(OOVPA*)&IDirect3DTexture8_LockRect_1_0_5558, (OOVPA*)&IDirect3DTexture8_LockRect_1_0_5233,
XTL::EmuIDirect3DTexture8_LockRect, XTL::EmuIDirect3DTexture8_LockRect,
@ -1427,9 +1405,9 @@ OOVPATable D3D8_1_0_5558[] =
"EmuIDirect3DTexture8_LockRect" "EmuIDirect3DTexture8_LockRect"
#endif #endif
}, },
// IDirect3DSurface8::LockRect (* unchanged since 4361 *) // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

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

@ -1479,9 +1479,9 @@ OOVPATable D3D8_1_0_5849[] =
"EmuIDirect3DTexture8_LockRect" "EmuIDirect3DTexture8_LockRect"
#endif #endif
}, },
// IDirect3DSurface8::LockRect (* unchanged since 4361 *) // IDirect3DSurface8::LockRect (* unchanged since 3925 *)
{ {
(OOVPA*)&IDirect3DSurface8_LockRect_1_0_4361, (OOVPA*)&IDirect3DSurface8_LockRect_1_0_3925,
XTL::EmuIDirect3DSurface8_LockRect, XTL::EmuIDirect3DSurface8_LockRect,

33
src/CxbxKrnl/HLEDataBase/XG.1.0.5233.inl
View File

@ -32,29 +32,6 @@
// * // *
// ****************************************************************** // ******************************************************************
// ******************************************************************
// * XGUnswizzleRect
// ******************************************************************
SOOVPA<8> XGUnswizzleRect_1_0_5233 =
{
0, // Large == 0
8, // Count == 8
-1, // Xref Not Saved
0, // Xref Not Used
{
{ 0x1E, 0x03 },
{ 0x3E, 0x00 },
{ 0x5E, 0xD2 },
{ 0x7E, 0x75 },
{ 0x9E, 0x70 },
{ 0xC1, 0xE9 },
{ 0xDE, 0x89 },
{ 0xFE, 0x60 },
}
};
// ****************************************************************** // ******************************************************************
// * XG_1_0_5233 // * XG_1_0_5233
// ****************************************************************** // ******************************************************************
@ -80,16 +57,6 @@ OOVPATable XG_1_0_5233[] =
"EmuXGSwizzleRect" "EmuXGSwizzleRect"
#endif #endif
}, },
// XGUnswizzleRect
{
(OOVPA*)&XGUnswizzleRect_1_0_5233,
XTL::EmuXGUnswizzleRect,
#ifdef _DEBUG_TRACE
"EmuXGUnswizzleRect"
#endif
},
}; };
// ****************************************************************** // ******************************************************************

10
src/CxbxKrnl/HLEDataBase/XG.1.0.5558.inl
View File

@ -112,16 +112,6 @@ OOVPATable XG_1_0_5558[] =
"EmuXGSwizzleRect" "EmuXGSwizzleRect"
#endif #endif
}, },
// XGUnswizzleRect (* unchanged since 5233 *)
{
(OOVPA*)&XGUnswizzleRect_1_0_5233,
XTL::EmuXGUnswizzleRect,
#ifdef _DEBUG_TRACE
"EmuXGUnswizzleRect"
#endif
},
// XGSwizzleBox (* UNTESTED *) // XGSwizzleBox (* UNTESTED *)
{ {
(OOVPA*)&XGSwizzleBox_1_0_5558, (OOVPA*)&XGSwizzleBox_1_0_5558,

176
src/CxbxKrnl/HLEDataBase/Xapi.1.0.3911.inl
View File

@ -447,6 +447,44 @@ SOOVPA<10> XCalculateSignatureBegin_1_0_3911 =
}; };
*/ */
// ******************************************************************
// * XGetDevices
// ******************************************************************
SOOVPA<14> XGetDevices_1_0_3911 =
{
0, // Large == 0
14, // Count == 14
-1, // XRef Not Saved
0, // XRef Not Used
{
// XGetDevices+0x07 : mov edx, [esp+arg_0]
{ 0x07, 0x8B }, // (Offset,Value)-Pair #1
{ 0x08, 0x54 }, // (Offset,Value)-Pair #2
{ 0x09, 0x24 }, // (Offset,Value)-Pair #3
{ 0x0A, 0x08 }, // (Offset,Value)-Pair #4
// XGetDevices+0x0D : and [edx+4], 0
{ 0x0D, 0x83 }, // (Offset,Value)-Pair #5
{ 0x0E, 0x62 }, // (Offset,Value)-Pair #6
{ 0x0F, 0x04 }, // (Offset,Value)-Pair #7
{ 0x10, 0x00 }, // (Offset,Value)-Pair #8
// XGetDevices+0x11 : mov cl, al
{ 0x11, 0x8A }, // (Offset,Value)-Pair #9
{ 0x12, 0xC8 }, // (Offset,Value)-Pair #10
// XGetDevices+0x16 : call KfLowerIrql
{ 0x16, 0xFF }, // (Offset,Value)-Pair #11
{ 0x17, 0x15 }, // (Offset,Value)-Pair #12
// XGetDevices+0x1F : retn 4
{ 0x1F, 0xC2 }, // (Offset,Value)-Pair #13
{ 0x20, 0x04 }, // (Offset,Value)-Pair #14
}
};
// ****************************************************************** // ******************************************************************
// * XGetDeviceChanges // * XGetDeviceChanges
// ****************************************************************** // ******************************************************************
@ -512,6 +550,106 @@ SOOVPA<11> XInputOpen_1_0_3911 =
} }
}; };
// ******************************************************************
// * XID_fCloseDevice
// ******************************************************************
SOOVPA<10> XID_fCloseDevice_1_0_3911 =
{
0, // Large == 0
10, // Count == 10
XREF_FCLOSEDEVICE, // XRef Is Saved
0, // XRef Not Used
{
// XID_fCloseDevice+0x19 : jz +0x5C
{ 0x19, 0x74 }, // (Offset,Value)-Pair #1
{ 0x1A, 0x5C }, // (Offset,Value)-Pair #2
// XID_fCloseDevice+0x1B : cmp [esi+0x00A3], 1
{ 0x1B, 0x80 }, // (Offset,Value)-Pair #3
{ 0x1D, 0xA3 }, // (Offset,Value)-Pair #4
{ 0x21, 0x01 }, // (Offset,Value)-Pair #5
// XID_fCloseDevice+0x91 : mov [esi+0x00A4], eax
{ 0x95, 0x89 }, // (Offset,Value)-Pair #6
{ 0x96, 0x86 }, // (Offset,Value)-Pair #7
{ 0x97, 0xA4 }, // (Offset,Value)-Pair #8
// XID_fCloseDevice+0xA3 : leave; retn
{ 0xA3, 0xC9 }, // (Offset,Value)-Pair #9
{ 0xA4, 0xC3 }, // (Offset,Value)-Pair #10
}
};
// ******************************************************************
// * XInputClose
// ******************************************************************
SOOVPA<8> XInputClose_1_0_3911 =
{
0, // Large == 0
8, // Count == 8
-1, // XRef Not Saved
1, // XRef Is Used
{
// XInputClose+0x05 : call [fCloseDevice]
{ 0x05, XREF_FCLOSEDEVICE }, // (Offset,Value)-Pair #1
// XInputClose+0x00 : mov ecx, [esp+0x04]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #2
{ 0x01, 0x4C }, // (Offset,Value)-Pair #3
{ 0x02, 0x24 }, // (Offset,Value)-Pair #4
{ 0x03, 0x04 }, // (Offset,Value)-Pair #5
// XInputClose+0x04 : call [fCloseDevice]
{ 0x04, 0xE8 }, // (Offset,Value)-Pair #6
// XInputClose+0x09 : retn 0x04
{ 0x09, 0xC2 }, // (Offset,Value)-Pair #7
{ 0x0A, 0x04 }, // (Offset,Value)-Pair #8
}
};
// ******************************************************************
// * XInputGetCapabilities
// ******************************************************************
SOOVPA<14> XInputGetCapabilities_1_0_3911 =
{
0, // Large == 0
14, // Count == 14
-1, // XRef Not Saved
0, // XRef Not Used
{
// XInputGetCapabilities+0x03 : sub esp, 0x48
{ 0x03, 0x83 }, // (Offset,Value)-Pair #1
{ 0x04, 0xEC }, // (Offset,Value)-Pair #2
{ 0x05, 0x48 }, // (Offset,Value)-Pair #3
// XInputGetCapabilities+0x24 : test byte ptr [esi+4], 2
{ 0x24, 0xF6 }, // (Offset,Value)-Pair #4
{ 0x25, 0x46 }, // (Offset,Value)-Pair #5
{ 0x26, 0x04 }, // (Offset,Value)-Pair #6
{ 0x27, 0x02 }, // (Offset,Value)-Pair #7
// XInputGetCapabilities+0x3A : stosb
{ 0x3A, 0xAA }, // (Offset,Value)-Pair #8
// XInputGetCapabilities+0x8A : mov [ebp+var_48], 0x30
{ 0x8A, 0xC6 }, // (Offset,Value)-Pair #9
{ 0x8B, 0x45 }, // (Offset,Value)-Pair #10
{ 0x8C, 0xB8 }, // (Offset,Value)-Pair #11
{ 0x8D, 0x30 }, // (Offset,Value)-Pair #12
// XInputGetCapabilities+0xFB : cmp [eax], ebx
{ 0xFB, 0x39 }, // (Offset,Value)-Pair #13
{ 0xFC, 0x18 }, // (Offset,Value)-Pair #14
}
};
// ****************************************************************** // ******************************************************************
// * XInputGetState // * XInputGetState
// ****************************************************************** // ******************************************************************
@ -728,6 +866,16 @@ OOVPATable XAPI_1_0_3911[] =
#endif #endif
}, },
*/ */
// XGetDevices
{
(OOVPA*)&XGetDevices_1_0_3911,
XTL::EmuXGetDevices,
#ifdef _DEBUG_TRACE
"EmuXGetDevices"
#endif
},
// XGetDeviceChanges // XGetDeviceChanges
{ {
(OOVPA*)&XGetDeviceChanges_1_0_3911, (OOVPA*)&XGetDeviceChanges_1_0_3911,
@ -748,6 +896,34 @@ OOVPATable XAPI_1_0_3911[] =
"EmuXInputOpen" "EmuXInputOpen"
#endif #endif
}, },
// XID_fCloseDevice
{
(OOVPA*)&XID_fCloseDevice_1_0_3911, 0,
#ifdef _DEBUG_TRACE
"XID_fCloseDevice (XREF)"
#endif
},
// XInputClose
{
(OOVPA*)&XInputClose_1_0_3911,
XTL::EmuXInputClose,
#ifdef _DEBUG_TRACE
"EmuXInputClose"
#endif
},
// XInputGetCapabilities
{
(OOVPA*)&XInputGetCapabilities_1_0_3911,
XTL::EmuXInputGetCapabilities,
#ifdef _DEBUG_TRACE
"EmuXInputGetCapabilities"
#endif
},
// XInputGetState // XInputGetState
{ {
(OOVPA*)&XInputGetState_1_0_3911, (OOVPA*)&XInputGetState_1_0_3911,

41
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4034.inl
View File

@ -32,43 +32,6 @@
// * // *
// ****************************************************************** // ******************************************************************
// ******************************************************************
// * XGetDevices
// ******************************************************************
SOOVPA<14> XGetDevices_1_0_4034 =
{
0, // Large == 0
14, // Count == 14
-1, // XRef Not Saved
0, // XRef Not Used
{
// XGetDevices+0x07 : mov edx, [esp+arg_0]
{ 0x07, 0x8B }, // (Offset,Value)-Pair #1
{ 0x08, 0x54 }, // (Offset,Value)-Pair #2
{ 0x09, 0x24 }, // (Offset,Value)-Pair #3
{ 0x0A, 0x08 }, // (Offset,Value)-Pair #4
// XGetDevices+0x0D : and [edx+4], 0
{ 0x0D, 0x83 }, // (Offset,Value)-Pair #5
{ 0x0E, 0x62 }, // (Offset,Value)-Pair #6
{ 0x0F, 0x04 }, // (Offset,Value)-Pair #7
{ 0x10, 0x00 }, // (Offset,Value)-Pair #8
// XGetDevices+0x11 : mov cl, al
{ 0x11, 0x8A }, // (Offset,Value)-Pair #9
{ 0x12, 0xC8 }, // (Offset,Value)-Pair #10
// XGetDevices+0x16 : call KfLowerIrql
{ 0x16, 0xFF }, // (Offset,Value)-Pair #11
{ 0x17, 0x15 }, // (Offset,Value)-Pair #12
// XGetDevices+0x1F : retn 4
{ 0x1F, 0xC2 }, // (Offset,Value)-Pair #13
{ 0x20, 0x04 }, // (Offset,Value)-Pair #14
}
};
/* /*
// ****************************************************************** // ******************************************************************
@ -249,9 +212,9 @@ OOVPATable XAPI_1_0_4034[] =
"EmuXInitDevices" "EmuXInitDevices"
#endif #endif
}, },
// XGetDevices // XGetDevices (* unchanged since 3911 *)
{ {
(OOVPA*)&XGetDevices_1_0_4034, (OOVPA*)&XGetDevices_1_0_3911,
XTL::EmuXGetDevices, XTL::EmuXGetDevices,

36
src/CxbxKrnl/HLEDataBase/Xapi.1.0.4361.inl
View File

@ -205,7 +205,7 @@ SOOVPA<11> XID_fCloseDevice_1_0_4361 =
{ 0x92, 0x86 }, // (Offset,Value)-Pair #5 { 0x92, 0x86 }, // (Offset,Value)-Pair #5
{ 0x93, 0xA7 }, // (Offset,Value)-Pair #6 { 0x93, 0xA7 }, // (Offset,Value)-Pair #6
// XID_fCloseDevice+0x91 : mov [esi+0x00A7], eax // XID_fCloseDevice+0x91 : mov [esi+0x00A7], eax // FIXME: Same instruction repeated.
{ 0x91, 0x89 }, // (Offset,Value)-Pair #7 { 0x91, 0x89 }, // (Offset,Value)-Pair #7
{ 0x92, 0x86 }, // (Offset,Value)-Pair #8 { 0x92, 0x86 }, // (Offset,Value)-Pair #8
{ 0x93, 0xA7 }, // (Offset,Value)-Pair #9 { 0x93, 0xA7 }, // (Offset,Value)-Pair #9
@ -216,36 +216,6 @@ SOOVPA<11> XID_fCloseDevice_1_0_4361 =
} }
}; };
// ******************************************************************
// * XInputClose
// ******************************************************************
SOOVPA<8> XInputClose_1_0_4361 =
{
0, // Large == 0
8, // Count == 8
-1, // XRef Not Saved
1, // XRef Is Used
{
// XInputClose+0x05 : call [fCloseDevice]
{ 0x05, XREF_FCLOSEDEVICE }, // (Offset,Value)-Pair #1
// XInputClose+0x00 : mov ecx, [esp+0x04]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #2
{ 0x01, 0x4C }, // (Offset,Value)-Pair #3
{ 0x02, 0x24 }, // (Offset,Value)-Pair #4
{ 0x03, 0x04 }, // (Offset,Value)-Pair #5
// XInputClose+0x04 : call [fCloseDevice]
{ 0x04, 0xE8 }, // (Offset,Value)-Pair #6
// XInputClose+0x09 : retn 0x04
{ 0x09, 0xC2 }, // (Offset,Value)-Pair #7
{ 0x0A, 0x04 }, // (Offset,Value)-Pair #8
}
};
// ****************************************************************** // ******************************************************************
// * XInputGetCapabilities // * XInputGetCapabilities
// ****************************************************************** // ******************************************************************
@ -614,9 +584,9 @@ OOVPATable XAPI_1_0_4361[] =
"XID_fCloseDevice (XREF)" "XID_fCloseDevice (XREF)"
#endif #endif
}, },
// XInputClose // XInputClose (* unchanged since 3911 *)
{ {
(OOVPA*)&XInputClose_1_0_4361, (OOVPA*)&XInputClose_1_0_3911,
XTL::EmuXInputClose, XTL::EmuXInputClose,