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

Consolidated D3DSurface_GetDesc OOVPA into one version

This commit is contained in:
PatrickvL 2017-05-08 17:28:06 +02:00
parent ccb549fa90
commit cbb69113ab
11 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,14 +337,37 @@ OOVPA_END;
// ******************************************************************
// * D3DSurface_GetDesc
// ******************************************************************
OOVPA_NO_XREF(D3DSurface_GetDesc, 3925, 7)
{ 0x01, 0x44 },
{ 0x04, 0x8B },
{ 0x07, 0x04 },
{ 0x0A, 0x00 },
{ 0x11, 0xC2 },
{ 0x12, 0x08 },
{ 0x13, 0x00 },
OOVPA_NO_XREF(D3DSurface_GetDesc, 3925, 16)
// D3DSurface_GetDesc+0x00 : mov eax, [esp+0x08]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #1
{ 0x01, 0x44 }, // (Offset,Value)-Pair #2
{ 0x02, 0x24 }, // (Offset,Value)-Pair #3
{ 0x03, 0x08 }, // (Offset,Value)-Pair #4
// D3DSurface_GetDesc+0x04 : mov ecx, [esp+0x04]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #5
{ 0x05, 0x4C }, // (Offset,Value)-Pair #6
{ 0x06, 0x24 }, // (Offset,Value)-Pair #7
{ 0x07, 0x04 }, // (Offset,Value)-Pair #8
// D3DSurface_GetDesc+0x08 : push eax
{ 0x08, 0x50 }, // (Offset,Value)-Pair #9
// D3DSurface_GetDesc+0x09 : push 0
{ 0x09, 0x6A }, // (Offset,Value)-Pair #10
{ 0x0A, 0x00 }, // (Offset,Value)-Pair #11
// D3DSurface_GetDesc+0x0B : push ecx
{ 0x0B, 0x51 }, // (Offset,Value)-Pair #12
// D3DSurface_GetDesc+0x0C : call [abs]
{ 0x0C, 0xE8 }, // (Offset,Value)-Pair #13
// D3DSurface_GetDesc+0x11 : retn 0x08
{ 0x11, 0xC2 }, // (Offset,Value)-Pair #14
{ 0x12, 0x08 }, // (Offset,Value)-Pair #15
{ 0x13, 0x00 }, // (Offset,Value)-Pair #15
OOVPA_END;
// ******************************************************************

37
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4134.inl
View File

@ -778,41 +778,6 @@ OOVPA_NO_XREF(D3DDevice_LightEnable, 4134, 13)
{ 0xE2, 0x08 }, // (Offset,Value)-Pair #13
OOVPA_END;
// ******************************************************************
// * D3DSurface_GetDesc
// ******************************************************************
OOVPA_NO_XREF(D3DSurface_GetDesc, 4134, 15)
// D3DSurface_GetDesc+0x00 : mov eax, [esp+0x08]
{ 0x00, 0x8B }, // (Offset,Value)-Pair #1
{ 0x01, 0x44 }, // (Offset,Value)-Pair #2
{ 0x02, 0x24 }, // (Offset,Value)-Pair #3
{ 0x03, 0x08 }, // (Offset,Value)-Pair #4
// D3DSurface_GetDesc+0x04 : mov ecx, [esp+0x04]
{ 0x04, 0x8B }, // (Offset,Value)-Pair #5
{ 0x05, 0x4C }, // (Offset,Value)-Pair #6
{ 0x06, 0x24 }, // (Offset,Value)-Pair #7
{ 0x07, 0x04 }, // (Offset,Value)-Pair #8
// D3DSurface_GetDesc+0x08 : push eax
{ 0x08, 0x50 }, // (Offset,Value)-Pair #9
// D3DSurface_GetDesc+0x09 : push 0
{ 0x09, 0x6A }, // (Offset,Value)-Pair #10
{ 0x0A, 0x00 }, // (Offset,Value)-Pair #11
// D3DSurface_GetDesc+0x0B : push ecx
{ 0x0B, 0x51 }, // (Offset,Value)-Pair #12
// D3DSurface_GetDesc+0x0C : call [abs]
{ 0x0C, 0xE8 }, // (Offset,Value)-Pair #13
// D3DSurface_GetDesc+0x11 : retn 0x08
{ 0x11, 0xC2 }, // (Offset,Value)-Pair #14
{ 0x12, 0x08 }, // (Offset,Value)-Pair #15
OOVPA_END;
// ******************************************************************
// * D3DDevice_SetRenderState_NormalizeNormals
// ******************************************************************
@ -1905,7 +1870,7 @@ OOVPATable D3D8_4134[] = {
REGISTER_OOVPA(D3DDevice_LightEnable, 4134, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_Lock, 4034, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_StencilFail, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetRenderState_NormalizeNormals, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_Reset, 4134, PATCH),

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

@ -1009,7 +1009,7 @@ OOVPATable D3D8_4361[] = {
REGISTER_OOVPA(D3DResource_Release, 4361, PATCH),
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 3925, PATCH),

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

@ -666,7 +666,7 @@ OOVPATable D3D8_4432[] {
REGISTER_OOVPA(D3DDevice_SetMaterial, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_GetDeviceCaps, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_SetRenderState_BackFillMode, 4531, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(Get2DSurfaceDesc, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_SetPixelShaderConstant, 4134, PATCH),
REGISTER_OOVPA(D3DDevice_DeletePixelShader, 3925, PATCH),

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

@ -2804,7 +2804,7 @@ REGISTER_OOVPA(D3DDevice_SetRenderState_CullMode, 4034, PATCH),
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3DResource_GetType, 4627, DISABLED),
REGISTER_OOVPA(Get2DSurfaceDesc, 4627, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DSurface_LockRect, 4627, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5028.inl
View File

@ -873,7 +873,7 @@ OOVPATable D3D8_5028[] = {
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3DResource_GetType, 4627, DISABLED), // I forget why I had this in here...
REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),

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

@ -727,7 +727,7 @@ OOVPATable D3D8_5233[] = {
REGISTER_OOVPA(D3DTexture_LockRect, 5233, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5028, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),

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

@ -902,7 +902,7 @@ OOVPATable D3D8_5344[] = {
REGISTER_OOVPA(D3DTexture_LockRect, 5233, PATCH),
REGISTER_OOVPA(Lock2DSurface, 3925, PATCH),
REGISTER_OOVPA(Get2DSurfaceDesc, 5344, PATCH), // Was 5233
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),
REGISTER_OOVPA(D3DBaseTexture_GetLevelCount, 4361, PATCH),
REGISTER_OOVPA(D3DTexture_GetSurfaceLevel2, 4627, PATCH),

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

@ -1400,7 +1400,7 @@ OOVPATable D3D8_5558[] = {
REGISTER_OOVPA(D3DResource_Register, 3925, PATCH),
REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5558, PATCH),
REGISTER_OOVPA(D3DSurface_LockRect, 3925, PATCH),

2
src/CxbxKrnl/HLEDataBase/D3D8.1.0.5788.inl
View File

@ -1016,7 +1016,7 @@ OOVPATable D3D8_5788[] = {
REGISTER_OOVPA(D3D_BlockOnResource, 5558, XREF),
REGISTER_OOVPA(D3DResource_BlockUntilNotBusy, 5558, PATCH),
REGISTER_OOVPA(D3DVertexBuffer_GetDesc, 5233, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5558, PATCH),

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

@ -227,7 +227,7 @@ OOVPATable D3D8_5849[] = {
REGISTER_OOVPA(D3DResource_AddRef, 3925, PATCH),
REGISTER_OOVPA(D3DResource_Release, 3925, PATCH),
REGISTER_OOVPA(D3DResource_IsBusy, 4361, PATCH),
REGISTER_OOVPA(D3DSurface_GetDesc, 4134, DISABLED),
REGISTER_OOVPA(D3DSurface_GetDesc, 3925, DISABLED),
REGISTER_OOVPA(D3DDevice_CopyRects, 5233, PATCH),
REGISTER_OOVPA(D3DPalette_Lock2, 4627, PATCH),
REGISTER_OOVPA(D3DTexture_LockRect, 5788, PATCH),