Skip to content

Commit

Permalink
fix symbol names
Browse files Browse the repository at this point in the history
  • Loading branch information
@RadWolfie
RadWolfie committed Nov 4, 2021
1 parent c2e8ffc commit ed6c97a
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/OOVPADatabase/D3D8/3911.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::SetStateUP
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateUP,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateUP,
3911)
OOVPA_SIG_MATCH(

Expand Down Expand Up @@ -1000,7 +1000,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::SetStateVB
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateVB,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateVB,
3911)
OOVPA_SIG_MATCH(

Expand Down
4 changes: 2 additions & 2 deletions src/OOVPADatabase/D3D8/4034.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::SetStateVB
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateVB,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateVB,
4034)
OOVPA_SIG_MATCH(

Expand Down Expand Up @@ -1807,7 +1807,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::SetStateUP
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateUP,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateUP,
4034)
OOVPA_SIG_MATCH(

Expand Down
2 changes: 1 addition & 1 deletion src/OOVPADatabase/D3D8/4039.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ OOVPA_SIG_MATCH(
// D3DDevice_BeginPush__8+0x00 : push esi; mov esi,[D3D__PDEVICE]
OV_MATCH(0x00, 0x56, 0x8B, 0x35),

// D3DDevice_BeginPush__8+0x0B : call D3DDevice_SetStateVB
// D3DDevice_BeginPush__8+0x0B : call CDevice_SetStateVB
OV_MATCH(0x0B, 0xE8),

// D3DDevice_BeginPush__8+0x17 : call XMETAL_StartPushCount
Expand Down
4 changes: 2 additions & 2 deletions src/OOVPADatabase/D3D8/4134.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ OOVPA_END;
// ******************************************************************
// * D3D::CDevice::SetStateVB
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateVB,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateVB,
4134)
OOVPA_SIG_MATCH(

Expand Down Expand Up @@ -735,7 +735,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::SetStateUP
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_SetStateUP,
OOVPA_SIG_HEADER_NO_XREF(CDevice_SetStateUP,
4134)
OOVPA_SIG_MATCH(

Expand Down
2 changes: 1 addition & 1 deletion src/OOVPADatabase/D3D8/4531.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ OOVPA_SIG_MATCH(
// D3DDevice_BeginPush__4+0x00 : push esi; mov esi,[D3D__PDEVICE]
OV_MATCH(0x00, 0x56, 0x8B, 0x35),

// D3DDevice_BeginPush__4+0x0B : call D3DDevice_SetStateVB
// D3DDevice_BeginPush__4+0x0B : call CDevice_SetStateVB
OV_MATCH(0x0B, 0xE8),

// D3DDevice_BeginPush__4+0x10 : mov eax,[esp+0x08]
Expand Down
2 changes: 1 addition & 1 deletion src/OOVPADatabase/D3D8/5028.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::LazySetStateUP
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_LazySetStateUP,
OOVPA_SIG_HEADER_NO_XREF(CDevice_LazySetStateUP,
5028)
OOVPA_SIG_MATCH(

Expand Down
2 changes: 1 addition & 1 deletion src/OOVPADatabase/D3D8/5558.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ OOVPA_SIG_MATCH(
// ******************************************************************
// * D3D::CDevice::LazySetStateUP
// ******************************************************************
OOVPA_SIG_HEADER_NO_XREF(D3DDevice_LazySetStateUP,
OOVPA_SIG_HEADER_NO_XREF(CDevice_LazySetStateUP,
5558)
OOVPA_SIG_MATCH(

Expand Down
18 changes: 9 additions & 9 deletions src/OOVPADatabase/D3D8_OOVPA.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,19 @@
OOVPATable D3D8_OOVPA[] = {
REGISTER_OOVPAS_M(D3DDevice__m_VerticalBlankEvent__ManualFindGeneric, 3911), // This OOVPA signature is not a symbol. Read its note for more details.

REGISTER_OOVPAS_D3D8(CDevice_MakeSpace, 3911), // NOTE: has multiple rets.
REGISTER_OOVPAS_D3D8(CMiniport_CreateCtxDmaObject, 3911, 4034),
REGISTER_OOVPAS_D3D8(CMiniport_InitHardware, 3911, 4034, 5455),
REGISTER_OOVPAS_D3D8(CMiniport_IsFlipPending, 3911, 4242, 4627, 4928),
REGISTER_OOVPAS_D3D(CDevice_MakeSpace, 3911), // NOTE: has multiple rets.
REGISTER_OOVPAS_D3D(CMiniport_CreateCtxDmaObject, 3911, 4034),
REGISTER_OOVPAS_D3D(CMiniport_InitHardware, 3911, 4034, 5455),
REGISTER_OOVPAS_D3D(CMiniport_IsFlipPending, 3911, 4242, 4627, 4928),
REGISTER_OOVPAS(D3DBaseTexture_GetLevelCount, 3911),
REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface, 3911, 4627), // Called D3DCubeTexture_GetCubeMapSurface2 (from 4627's comment) NOTE: Use D3DCubeTexture_GetCubeMapSurface2 for 4627 and above
REGISTER_OOVPAS(D3DCubeTexture_GetCubeMapSurface2, 4627),
REGISTER_OOVPAS(D3DCubeTexture_LockRect, 3911), // Just calls Lock2DSurface (from 4134, 4432's comment)
REGISTER_OOVPAS(D3DDevice_AddRef, 3911, 4039, 4134, 4242, 4627, 5028, 5344, 5558, 5788),
REGISTER_OOVPAS(D3DDevice_ApplyStateBlock, 3911, 4627),
REGISTER_OOVPAS(D3DDevice_Begin, 3911, 4039),
REGISTER_OOVPAS(D3DDevice_BeginPush, 4531, 4627, 5028), // NOTE: should be D3DDevice_BeginPush_4 and maybe include reference to D3DDevice_SetStateVB
REGISTER_OOVPAS(D3DDevice_BeginPush2, 4039), // NOTE: should be D3DDevice_BeginPush_8 and maybe include reference to D3DDevice_SetStateVB
REGISTER_OOVPAS(D3DDevice_BeginPush, 4531, 4627, 5028), // NOTE: should be D3DDevice_BeginPush_4 and maybe include reference to CDevice_SetStateVB
REGISTER_OOVPAS(D3DDevice_BeginPush2, 4039), // NOTE: should be D3DDevice_BeginPush_8 and maybe include reference to CDevice_SetStateVB
REGISTER_OOVPAS(D3DDevice_BeginPushBuffer, 3911, 4039), // Not implemented yet. (from 5788's comment)
REGISTER_OOVPAS(D3DDevice_BeginStateBig, 5028),
REGISTER_OOVPAS(D3DDevice_BeginStateBlock, 3911, 4134),
Expand Down Expand Up @@ -284,7 +284,7 @@ OOVPATable D3D8_OOVPA[] = {
REGISTER_OOVPAS_D3D(CDevice_KickOff, 3911, 4034, 4531, 5028, 5455),
REGISTER_OOVPAS(D3DDevice_KickPushBuffer, 3911),
REGISTER_OOVPAS(D3DDevice_LazySetStateVB, 5028, 5558),
REGISTER_OOVPAS(D3DDevice_LazySetStateUP, 5028, 5558),
REGISTER_OOVPAS_D3D(CDevice_LazySetStateUP, 5028, 5558),
REGISTER_OOVPAS(D3DDevice_LightEnable, 3911, 5344), // Was 5233 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_LoadVertexShader, 3911, 4034, 4627, 5028),
REGISTER_OOVPAS(D3DDevice_LoadVertexShaderProgram, 3911),
Expand Down Expand Up @@ -353,8 +353,8 @@ OOVPATable D3D8_OOVPA[] = {
REGISTER_OOVPAS(D3DDevice_SetScreenSpaceOffset, 4034, 5455), // Was 5233 (from 5344's comment)
REGISTER_OOVPAS(D3DDevice_SetShaderConstantMode, 3911, 4034),
REGISTER_OOVPAS(D3DDevice_SetSoftDisplayFilter, 3911, 4034, 4134),
REGISTER_OOVPAS(D3DDevice_SetStateUP, 3911, 4034, 4134),
REGISTER_OOVPAS(D3DDevice_SetStateVB, 3911, 4034, 4134),
REGISTER_OOVPAS_D3D(CDevice_SetStateUP, 3911, 4034, 4134),
REGISTER_OOVPAS_D3D(CDevice_SetStateVB, 3911, 4034, 4134),
REGISTER_OOVPAS(D3DDevice_SetStipple, 4627),
REGISTER_OOVPAS(D3DDevice_SetStreamSource, 3911, 4034),
REGISTER_OOVPAS(D3DDevice_SetSwapCallback, 4039), // Final generic OOVPA: 4039; Removed: 0
Expand Down
19 changes: 10 additions & 9 deletions src/xref/d3d8.def
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,21 @@ XREF_SYMBOL(OFFSET_D3DDEVICE_M_VERTEXSHADER) // initially set to XREF_ADDR

// Functions
// include D3D8 prefix
XREF_SYMBOL(D3D8_CDevice_MakeSpace)
XREF_SYMBOL(D3D8_CMiniport_CreateCtxDmaObject)
XREF_SYMBOL(D3D_CMiniport_GetDisplayCapabilities)
XREF_SYMBOL(D3D8_CMiniport_InitHardware)
XREF_SYMBOL(D3D8_CMiniport_IsFlipPending)
XREF_SYMBOL(D3D8_Lock2DSurface)
XREF_SYMBOL(D3D8_Lock3DSurface)
XREF_SYMBOL(D3D8_Get2DSurfaceDesc)
// include D3D prefix
XREF_SYMBOL(D3D_CDevice_KickOff)
XREF_SYMBOL(D3D_CDevice_LazySetStateUP)
XREF_SYMBOL(D3D_CDevice_MakeSpace)
XREF_SYMBOL(D3D_CDevice_SetStateUP)
XREF_SYMBOL(D3D_CDevice_SetStateVB)
XREF_SYMBOL(D3D_CMiniport_CreateCtxDmaObject)
XREF_SYMBOL(D3D_CMiniport_GetDisplayCapabilities)
XREF_SYMBOL(D3D_CMiniport_InitHardware)
XREF_SYMBOL(D3D_CMiniport_IsFlipPending)
// D3D prefix
XREF_SYMBOL(D3D_AllocContiguousMemory)
XREF_SYMBOL(D3D_CDevice_KickOff)
XREF_SYMBOL(D3D_BlockOnResource)
XREF_SYMBOL(D3D_BlockOnTime)
XREF_SYMBOL(D3D_CheckDeviceFormat)
Expand Down Expand Up @@ -181,7 +185,6 @@ XREF_SYMBOL(D3DDevice_IsBusy)
XREF_SYMBOL(D3DDevice_IsFencePending)
XREF_SYMBOL(D3DDevice_KickPushBuffer)
XREF_SYMBOL(D3DDevice_LazySetStateVB)
XREF_SYMBOL(D3DDevice_LazySetStateUP)
XREF_SYMBOL(D3DDevice_LightEnable)
XREF_SYMBOL(D3DDevice_LoadVertexShader)
XREF_SYMBOL(D3DDevice_LoadVertexShaderProgram)
Expand Down Expand Up @@ -249,8 +252,6 @@ XREF_SYMBOL(D3DDevice_SetScissors)
XREF_SYMBOL(D3DDevice_SetScreenSpaceOffset)
XREF_SYMBOL(D3DDevice_SetShaderConstantMode)
XREF_SYMBOL(D3DDevice_SetSoftDisplayFilter)
XREF_SYMBOL(D3DDevice_SetStateUP)
XREF_SYMBOL(D3DDevice_SetStateVB)
XREF_SYMBOL(D3DDevice_SetStipple)
XREF_SYMBOL(D3DDevice_SetStreamSource)
XREF_SYMBOL(D3DDevice_SetSwapCallback)
Expand Down

0 comments on commit ed6c97a

Please sign in to comment.