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

Rename full-uppercase D3D XREF id's

This commit is contained in:
jarupxx 2017-10-29 13:59:02 +09:00
parent 751725387c
commit c868a98791
12 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/CxbxKrnl/HLEDataBase.h
View File

@ -85,14 +85,14 @@ enum XRefDataBaseOffset
{
XREF_D3DDEVICE=0,
XREF_D3DDevice_SetRenderState_CullMode,
XREF_D3DRS_CULLMODE,
XREF_D3DTSS_TEXCOORDINDEX,
XREF_D3DRS_MULTISAMPLEMODE,
XREF_D3DRS_MULTISAMPLERENDERTARGETMODE,
XREF_D3DRS_ROPZCMPALWAYSREAD,
XREF_D3DRS_ROPZREAD,
XREF_D3DRS_DONOTCULLUNCOMPRESSED,
XREF_D3DRS_STENCILCULLENABLE,
XREF_D3D_RenderState_CullMode,
XREF_D3D_TextureState_TexCoordIndex,
XREF_D3D_RenderState_MultiSampleMode,
XREF_D3D_RenderState_MultiSampleRenderTargetMode,
XREF_D3D_RenderState_RopZCmpAlwaysRead,
XREF_D3D_RenderState_RopZRead,
XREF_D3D_RenderState_DoNotCullUncompressed,
XREF_D3D_RenderState_StencilCullEnable,
XREF_D3DDevice_SetLight,
XREF_D3DDevice_LazySetStateVB,
XREF_D3D_BlockOnResource,

12
src/CxbxKrnl/HLEDataBase/D3D8.1.0.3911.inl
View File

@ -998,7 +998,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 3911, 1+11,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x11, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x11, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07
{ 0x0B, 0xC1 },
@ -1029,7 +1029,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3911, 2+15,
XRefTwo)
XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived
XREF_ENTRY(0x25, XREF_D3DRS_CULLMODE), // Derived
XREF_ENTRY(0x25, XREF_D3D_RenderState_CullMode), // Derived
// D3DDevice_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C
{ 0x42, 0xC7 },
@ -3438,7 +3438,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3911, 1+7,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0D, XREF_D3DRS_STENCILCULLENABLE ),
XREF_ENTRY( 0x0D, XREF_D3D_RenderState_StencilCullEnable ),
{ 0x0B, 0x56 },
{ 0x16, 0x8B },
@ -4125,7 +4125,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3911, 1+8,
XRefOne)
// D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ),
// D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -4151,7 +4151,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3911, 1+8,
XRefOne)
// D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_ROPZREAD ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZRead ),
// D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -4177,7 +4177,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3911, 1+8,
XRefOne)
// D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_DoNotCullUncompressed ),
// D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },

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

@ -1349,7 +1349,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 3925, 1+11,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x11, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x11, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x0B : shl eax, 0x07
{ 0x0B, 0xC1 },
@ -1455,7 +1455,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 3925, 2+15,
XRefTwo)
XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived
XREF_ENTRY(0x25, XREF_D3DRS_CULLMODE), // Derived
XREF_ENTRY(0x25, XREF_D3D_RenderState_CullMode), // Derived
// D3DDevice_SetRenderState_CullMode+0x42 : mov dword ptr [eax+8], 0x4039C
{ 0x42, 0xC7 },
@ -2882,7 +2882,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 3925, 1+7,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0D, XREF_D3DRS_STENCILCULLENABLE ),
XREF_ENTRY( 0x0D, XREF_D3D_RenderState_StencilCullEnable ),
{ 0x0B, 0x56 },
{ 0x16, 0x8B },
@ -3550,7 +3550,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 3925, 1+8,
XRefOne)
// D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ),
// D3DDevice_SetRenderState_RopZCmpAlwaysRead+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -3577,7 +3577,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZRead, 3925, 1+8,
XRefOne)
// D3DDevice_SetRenderState_RopZRead+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_ROPZREAD ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZRead ),
// D3DDevice_SetRenderState_RopZRead+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },
@ -3604,7 +3604,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_DoNotCullUncompressed, 3925, 1+8,
XRefOne)
// D3DDevice_SetRenderState_DoNotCullUncompressed+0x05 : D3D__RenderState[D3DRS_ROPZCMPALWAYSREAD]
XREF_ENTRY( 0x05, XREF_D3DRS_DONOTCULLUNCOMPRESSED ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_DoNotCullUncompressed ),
// D3DDevice_SetRenderState_DoNotCullUncompressed+0x00 : mov eax, [esp+0x04]
{ 0x00, 0x8B },

6
src/CxbxKrnl/HLEDataBase/D3D8.1.0.4034.inl
View File

@ -218,7 +218,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 4034, 2+14,
XRefTwo)
XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived
XREF_ENTRY(0x2B, XREF_D3DRS_CULLMODE), // Derived
XREF_ENTRY(0x2B, XREF_D3D_RenderState_CullMode), // Derived
// D3DDevice_SetRenderState_CullMode+0x00 : push esi
{ 0x00, 0x56 },
@ -1144,7 +1144,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4034, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x18, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x18, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07
{ 0x13, 0xC1 },
@ -2055,7 +2055,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4034, 1+12,
XRefOne)
// D3DDevice_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE]
XREF_ENTRY( 0x0C, XREF_D3DRS_STENCILCULLENABLE ),
XREF_ENTRY( 0x0C, XREF_D3D_RenderState_StencilCullEnable ),
// D3DDevice_SetRenderState_StencilCullEnable+0x15 : jb +0x05
{ 0x15, 0x72 },

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

@ -41,7 +41,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4134, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x18, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x18, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x13 : shl eax, 0x07
{ 0x13, 0xC1 },
@ -1174,7 +1174,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_StencilCullEnable, 4134, 1+12,
XRefOne)
// D3DDevice_SetRenderState_StencilCullEnable+0x0C : D3D__RenderState[D3DRS_STENCILCULLENABLE]
XREF_ENTRY( 0x0C, XREF_D3DRS_STENCILCULLENABLE ),
XREF_ENTRY( 0x0C, XREF_D3D_RenderState_StencilCullEnable ),
// D3DDevice_SetRenderState_StencilCullEnable+0x15 : jb +0x05
{ 0x15, 0x72 },

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

@ -116,7 +116,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4242, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07
{ 0x0D, 0xC1 },

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

@ -619,7 +619,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4242, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x0D : shl eax, 0x07
{ 0x0D, 0xC1 },

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

@ -1686,7 +1686,7 @@ OOVPA_XREF(D3DDevice_SetTextureState_TexCoordIndex, 4627, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY(0x19, XREF_D3DTSS_TEXCOORDINDEX), // Derived
XREF_ENTRY(0x19, XREF_D3D_TextureState_TexCoordIndex), // Derived
// D3DDevice_SetTextureState_TexCoordIndex+0x14 : shl eax, 0x07
{ 0x14, 0xC1 },
@ -3053,7 +3053,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 4627, 1+10,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ),
XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ),
{ 0x03, 0x04 },

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

@ -135,7 +135,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_CullMode, 5233, 2+13,
XRefTwo)
XREF_ENTRY(0x03, XREF_D3DDEVICE), // Derived
XREF_ENTRY(0x2B, XREF_D3DRS_CULLMODE), // Derived
XREF_ENTRY(0x2B, XREF_D3D_RenderState_CullMode), // Derived
// D3DDevice_SetRenderState_CullMode+0x19 : mov dword ptr [eax], 0x40308
{ 0x19, 0xC7 },
@ -402,7 +402,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5233, 1+7,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ),
XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ),
{ 0x03, 0x04 },
{ 0x0F, 0x8B },

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

@ -189,7 +189,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_MultiSampleRenderTargetMode, 5344, 1+7,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x0B, XREF_D3DRS_MULTISAMPLERENDERTARGETMODE ),
XREF_ENTRY( 0x0B, XREF_D3D_RenderState_MultiSampleRenderTargetMode ),
{ 0x03, 0x04 },
{ 0x0F, 0x8B },

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

@ -993,7 +993,7 @@ OOVPA_XREF(D3DDevice_SetRenderState_RopZCmpAlwaysRead, 5788, 1+6,
XRefNoSaveIndex,
XRefOne)
XREF_ENTRY( 0x05, XREF_D3DRS_ROPZCMPALWAYSREAD ),
XREF_ENTRY( 0x05, XREF_D3D_RenderState_RopZCmpAlwaysRead ),
{ 0x01, 0x44 },
{ 0x04, 0xA3 },

42
src/CxbxKrnl/HLEIntercept.cpp
View File

@ -278,8 +278,8 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
// Request a few fundamental XRefs to be derived instead of checked
XRefDataBase[XREF_D3DDEVICE] = XREF_ADDR_DERIVE;
XRefDataBase[XREF_D3DRS_CULLMODE] = XREF_ADDR_DERIVE;
XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = XREF_ADDR_DERIVE;
XRefDataBase[XREF_D3D_RenderState_CullMode] = XREF_ADDR_DERIVE;
XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] = XREF_ADDR_DERIVE;
for(int p=0;UnResolvedXRefs < LastUnResolvedXRefs;p++)
{
@ -368,7 +368,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
int patchOffset = 0; // TODO : Rename into something understandable
// Read address of D3DRS_CULLMODE from D3DDevice_SetRenderState_CullMode
// TODO : Simplify this when XREF_D3DRS_CULLMODE derivation is deemed stable
// TODO : Simplify this when XREF_D3D_RenderState_CullMode derivation is deemed stable
{
if (BuildVersion >= 3911 && BuildVersion < 4034) {
DerivedAddr_D3DRS_CULLMODE = *(xbaddr*)(pFunc + 0x25);
@ -407,12 +407,12 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
g_SymbolAddresses["D3DDEVICE"] = DerivedAddr_D3DDevice;
// Temporary verification - is XREF_D3DRS_CULLMODE derived correctly?
if (XRefDataBase[XREF_D3DRS_CULLMODE] != DerivedAddr_D3DRS_CULLMODE) {
if (XRefDataBase[XREF_D3DRS_CULLMODE] != XREF_ADDR_DERIVE)
CxbxPopupMessage("Second derived XREF_D3DRS_CULLMODE differs from first!");
// Temporary verification - is XREF_D3D_RenderState_CullMode derived correctly?
if (XRefDataBase[XREF_D3D_RenderState_CullMode] != DerivedAddr_D3DRS_CULLMODE) {
if (XRefDataBase[XREF_D3D_RenderState_CullMode] != XREF_ADDR_DERIVE)
CxbxPopupMessage("Second derived XREF_D3D_RenderState_CullMode differs from first!");
XRefDataBase[XREF_D3DRS_CULLMODE] = DerivedAddr_D3DRS_CULLMODE;
XRefDataBase[XREF_D3D_RenderState_CullMode] = DerivedAddr_D3DRS_CULLMODE;
}
}
@ -421,12 +421,12 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
patchOffset -= Increment;
// Derive address of a few other deferred render state slots (to help xref-based function location)
XRefDataBase[XREF_D3DRS_MULTISAMPLEMODE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 8*4;
XRefDataBase[XREF_D3DRS_MULTISAMPLERENDERTARGETMODE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 7*4;
XRefDataBase[XREF_D3DRS_STENCILCULLENABLE] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 0*4;
XRefDataBase[XREF_D3DRS_ROPZCMPALWAYSREAD] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 1*4;
XRefDataBase[XREF_D3DRS_ROPZREAD] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 2*4;
XRefDataBase[XREF_D3DRS_DONOTCULLUNCOMPRESSED] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 3*4;
XRefDataBase[XREF_D3D_RenderState_MultiSampleMode] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 8*4;
XRefDataBase[XREF_D3D_RenderState_MultiSampleRenderTargetMode] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset - 7*4;
XRefDataBase[XREF_D3D_RenderState_StencilCullEnable] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 0*4;
XRefDataBase[XREF_D3D_RenderState_RopZCmpAlwaysRead] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 1*4;
XRefDataBase[XREF_D3D_RenderState_RopZRead] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 2*4;
XRefDataBase[XREF_D3D_RenderState_DoNotCullUncompressed] = (xbaddr)XTL::EmuD3DDeferredRenderState + patchOffset + 3*4;
for(int v=0;v<44;v++) {
XTL::EmuD3DDeferredRenderState[v] = XTL::X_D3DRS_UNK;
@ -434,7 +434,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
g_SymbolAddresses["D3DDeferredRenderState"] = (DWORD)XTL::EmuD3DDeferredRenderState;
printf("HLE: 0x%.08X -> EmuD3DDeferredRenderState\n", XTL::EmuD3DDeferredRenderState);
//DbgPrintf("HLE: 0x%.08X -> XREF_D3DRS_ROPZCMPALWAYSREAD\n", XRefDataBase[XREF_D3DRS_ROPZCMPALWAYSREAD] );
//DbgPrintf("HLE: 0x%.08X -> XREF_D3D_RenderState_RopZCmpAlwaysRead\n", XRefDataBase[XREF_D3D_RenderState_RopZCmpAlwaysRead] );
} else {
XTL::EmuD3DDeferredRenderState = nullptr;
CxbxKrnlCleanup("EmuD3DDeferredRenderState was not found!");
@ -457,7 +457,7 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
xbaddr DerivedAddr_D3DTSS_TEXCOORDINDEX = NULL;
int Decrement = 0x70; // TODO : Rename into something understandable
// TODO : Remove this when XREF_D3DTSS_TEXCOORDINDEX derivation is deemed stable
// TODO : Remove this when XREF_D3D_TextureState_TexCoordIndex derivation is deemed stable
{
if (BuildVersion >= 3911 && BuildVersion < 4034) // 0x18F180
DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x11);
@ -466,13 +466,13 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
else
DerivedAddr_D3DTSS_TEXCOORDINDEX = *(xbaddr*)(pFunc + 0x19);
// Temporary verification - is XREF_D3DTSS_TEXCOORDINDEX derived correctly?
if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != DerivedAddr_D3DTSS_TEXCOORDINDEX) {
if (XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] != XREF_ADDR_DERIVE) {
CxbxPopupMessage("Second derived XREF_D3DTSS_TEXCOORDINDEX differs from first!");
// Temporary verification - is XREF_D3D_TextureState_TexCoordIndex derived correctly?
if (XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] != DerivedAddr_D3DTSS_TEXCOORDINDEX) {
if (XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] != XREF_ADDR_DERIVE) {
CxbxPopupMessage("Second derived XREF_D3D_TextureState_TexCoordIndex differs from first!");
}
XRefDataBase[XREF_D3DTSS_TEXCOORDINDEX] = DerivedAddr_D3DTSS_TEXCOORDINDEX;
XRefDataBase[XREF_D3D_TextureState_TexCoordIndex] = DerivedAddr_D3DTSS_TEXCOORDINDEX;
}
}