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

Cleaner and optimized check if title has containing library. 

It is a requirement to move library header before start scanning symbols. Plus only call status check once.
This commit is contained in:
RadWolfie 2018-06-11 02:43:22 -05:00
parent 2b8a7a82a8
commit 33b0df3112
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/CxbxKrnl/HLEIntercept.cpp
View File

@ -325,22 +325,21 @@ void EmuD3D_Init_DeferredStates()
} }
// Update shared structure with GUI process // Update shared structure with GUI process
void EmuUpdateLLEStatus() void EmuUpdateLLEStatus(uint32_t XbLibScan)
{ {
int FlagsLLE; int FlagsLLE;
g_EmuShared->GetFlagsLLE(&FlagsLLE); g_EmuShared->GetFlagsLLE(&FlagsLLE);
if ((FlagsLLE & LLE_GPU) == false if ((FlagsLLE & LLE_GPU) == false
&& (g_SymbolAddresses.find("Direct3D_CreateDevice") == g_SymbolAddresses.end() && !((XbLibScan & XbSymbolLib_D3D8) > 0
|| g_SymbolAddresses["Direct3D_CreateDevice"] == 0)) { || (XbLibScan & XbSymbolLib_D3D8LTCG) > 0)) {
bLLE_GPU = true; bLLE_GPU = true;
FlagsLLE ^= LLE_GPU; FlagsLLE ^= LLE_GPU;
EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE GPU."); EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE GPU.");
} }
if ((FlagsLLE & LLE_APU) == false if ((FlagsLLE & LLE_APU) == false
&& (g_SymbolAddresses.find("DirectSoundCreate") == g_SymbolAddresses.end() && (XbLibScan & XbSymbolLib_DSOUND) == 0) {
|| g_SymbolAddresses["DirectSoundCreate"] == 0)) {
bLLE_APU = true; bLLE_APU = true;
FlagsLLE ^= LLE_APU; FlagsLLE ^= LLE_APU;
EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE APU."); EmuOutputMessage(XB_OUTPUT_MESSAGE_INFO, "Fallback to LLE APU.");
@ -353,6 +352,27 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
{ {
Xbe::LibraryVersion *pLibraryVersion = (Xbe::LibraryVersion*)pXbeHeader->dwLibraryVersionsAddr; Xbe::LibraryVersion *pLibraryVersion = (Xbe::LibraryVersion*)pXbeHeader->dwLibraryVersionsAddr;
uint16 xdkVersion = 0;
uint32_t XbLibScan = 0;
// NOTE: We need to check if title has library header to optimize verification process.
if (pLibraryVersion != nullptr) {
uint32 dwLibraryVersions = pXbeHeader->dwLibraryVersions;
// Get the highest revision build and prefix library to scan.
for (uint32 v = 0; v < dwLibraryVersions; v++) {
uint16 BuildVersion = pLibraryVersion[v].wBuildVersion;
uint16 QFEVersion = pLibraryVersion[v].wFlags.QFEVersion;
if (xdkVersion < BuildVersion) {
xdkVersion = BuildVersion;
}
XbLibScan |= XbSymbolLibrayToFlag(std::string(pLibraryVersion[v].szName, pLibraryVersion[v].szName + 8).c_str());
}
}
EmuUpdateLLEStatus(XbLibScan);
printf("\n"); printf("\n");
printf("*******************************************************************************\n"); printf("*******************************************************************************\n");
printf("* Cxbx-Reloaded High Level Emulation database\n"); printf("* Cxbx-Reloaded High Level Emulation database\n");
@ -468,8 +488,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
EmuD3D_Init_DeferredStates(); EmuD3D_Init_DeferredStates();
EmuUpdateLLEStatus();
g_HLECacheUsed = true; g_HLECacheUsed = true;
} }
@ -488,26 +506,10 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
// //
// initialize Microsoft XDK emulation // initialize Microsoft XDK emulation
// //
if(pLibraryVersion != 0) if(pLibraryVersion != nullptr) {
{
printf("HLE: Detected Microsoft XDK application...\n"); printf("HLE: Detected Microsoft XDK application...\n");
uint32 dwLibraryVersions = pXbeHeader->dwLibraryVersions;
uint16 xdkVersion = 0;
uint32_t XbLibScan = 0;
// Get the highest revision build and prefix library to scan.
for (uint32 v = 0; v < dwLibraryVersions; v++) {
uint16 BuildVersion = pLibraryVersion[v].wBuildVersion;
uint16 QFEVersion = pLibraryVersion[v].wFlags.QFEVersion;
if (xdkVersion < BuildVersion) {
xdkVersion = BuildVersion;
}
XbLibScan |= XbSymbolLibrayToFlag(std::string(pLibraryVersion[v].szName, pLibraryVersion[v].szName + 8).c_str());
}
// TODO: Is this enough for alias? We need to verify it. // TODO: Is this enough for alias? We need to verify it.
if ((XbLibScan & XbSymbolLib_D3D8) > 0 || (XbLibScan & XbSymbolLib_D3D8LTCG) > 0) { if ((XbLibScan & XbSymbolLib_D3D8) > 0 || (XbLibScan & XbSymbolLib_D3D8LTCG) > 0) {
g_BuildVersion = xdkVersion; g_BuildVersion = xdkVersion;
@ -589,8 +591,6 @@ void EmuHLEIntercept(Xbe::Header *pXbeHeader)
cacheAddress << std::hex << (*it).second; cacheAddress << std::hex << (*it).second;
WritePrivateProfileString("Symbols", (*it).first.c_str(), cacheAddress.str().c_str(), filename.c_str()); WritePrivateProfileString("Symbols", (*it).first.c_str(), cacheAddress.str().c_str(), filename.c_str());
} }
EmuUpdateLLEStatus();
} }
// NOTE: EmuInstallPatch do not get to be in XbSymbolDatabase, do the patches in Cxbx project only. // NOTE: EmuInstallPatch do not get to be in XbSymbolDatabase, do the patches in Cxbx project only.