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

Aliassed D3DTexture_LockRect better 

D3DTexture_LockRect version 5849 already appeared in 5788, which is
identical to 5233 (the version in between, 5558, is different, by one
OV-pair, so I kept that).

PS: I found this purely by accident, when taking a quick look at jarupxx
past few commits, of which 2c6dfd5b stood out because of the "Removed"
description. I fear more of these little mistakes might have slipped in
with that batch...
This commit is contained in:
PatrickvL 2017-01-23 10:54:18 +01:00
parent 5b1b58b3b0
commit ee5798b10c
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,6 +490,11 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 5788, 8)
{ 0xFE, 0x7D }, { 0xFE, 0x7D },
OOVPA_END; OOVPA_END;
// ******************************************************************
// * D3DTexture_LockRect
// ******************************************************************
#define D3DTexture_LockRect_5788 D3DTexture_LockRect_5233
// ****************************************************************** // ******************************************************************
// * D3DDevice_BeginPushBuffer // * D3DDevice_BeginPushBuffer
// ****************************************************************** // ******************************************************************
@ -1354,7 +1359,7 @@ OOVPATable D3D8_5788[] = {
OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925), OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925),
OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361), OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361),
OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627), OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627),
OOVPA_TABLE_ENTRY(D3DDevice_SetLight, 5558), OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5788),
OOVPA_TABLE_ENTRY(D3DDevice_CreateVertexBuffer2, 5788), OOVPA_TABLE_ENTRY(D3DDevice_CreateVertexBuffer2, 5788),
OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock, 5788), OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock, 5788),
OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock2, 5788), OOVPA_TABLE_ENTRY(D3DVertexBuffer_Lock2, 5788),

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

@ -505,20 +505,6 @@ OOVPA_NO_XREF(D3DDevice_DrawVerticesUP, 5849, 8)
{ 0xFE, 0x7D }, { 0xFE, 0x7D },
OOVPA_END; OOVPA_END;
// ******************************************************************
// * D3DTexture_LockRect
// ******************************************************************
OOVPA_NO_XREF(D3DTexture_LockRect, 5849, 7)
{ 0x03, 0x14 },
{ 0x08, 0x8B },
{ 0x0D, 0x8B },
{ 0x12, 0x8B },
{ 0x17, 0x50 },
{ 0x20, 0xC2 },
{ 0x21, 0x14 },
OOVPA_END;
// ****************************************************************** // ******************************************************************
// * D3DDevice_BeginPushBuffer // * D3DDevice_BeginPushBuffer
// ****************************************************************** // ******************************************************************
@ -1350,7 +1336,7 @@ OOVPATable D3D8_5849[] = {
OOVPA_TABLE_ENTRY(D3DSurface_GetDesc, 4361), OOVPA_TABLE_ENTRY(D3DSurface_GetDesc, 4361),
OOVPA_TABLE_ENTRY(D3DDevice_CopyRects, 5233), OOVPA_TABLE_ENTRY(D3DDevice_CopyRects, 5233),
OOVPA_TABLE_ENTRY(D3DPalette_Lock2, 5233), OOVPA_TABLE_ENTRY(D3DPalette_Lock2, 5233),
OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5849), OOVPA_TABLE_ENTRY(D3DTexture_LockRect, 5788),
OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925), OOVPA_TABLE_ENTRY(D3DSurface_LockRect, 3925),
OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361), OOVPA_TABLE_ENTRY(D3DBaseTexture_GetLevelCount, 4361),
OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627), OOVPA_TABLE_ENTRY(D3DTexture_GetSurfaceLevel2, 4627),