ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2718 from cthbleachbit/develop

Browse Source 
mangohud support: MangoHud::getLibraryString should return absolute path
This commit is contained in:
Alexandru Ionut Tripon 2024-08-12 11:26:30 +03:00 committed by GitHub
commit 6b07e8e72d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
launcher/MangoHud.cpp
View File

@ -40,8 +40,8 @@ namespace MangoHud {
QString getLibraryString() QString getLibraryString()
{ {
/* /**
* Check for vulkan layers in this order: * Guess MangoHud install location by searching for vulkan layers in this order:
* *
* $VK_LAYER_PATH * $VK_LAYER_PATH
* $XDG_DATA_DIRS (/usr/local/share/:/usr/share/) * $XDG_DATA_DIRS (/usr/local/share/:/usr/share/)
@ -49,8 +49,9 @@ QString getLibraryString()
* /etc * /etc
* $XDG_CONFIG_DIRS (/etc/xdg) * $XDG_CONFIG_DIRS (/etc/xdg)
* $XDG_CONFIG_HOME (~/.config) * $XDG_CONFIG_HOME (~/.config)
*
* @returns Absolute path of libMangoHud.so if found and empty QString otherwise.
*/ */
QStringList vkLayerList; QStringList vkLayerList;
{ {
QString home = QDir::homePath(); QString home = QDir::homePath();
@ -85,7 +86,7 @@ QString getLibraryString()
vkLayerList << FS::PathCombine(xdgConfigHome, "vulkan", "implicit_layer.d"); vkLayerList << FS::PathCombine(xdgConfigHome, "vulkan", "implicit_layer.d");
} }
for (QString vkLayer : vkLayerList) { for (const QString& vkLayer : vkLayerList) {
// prefer to use architecture specific vulkan layers // prefer to use architecture specific vulkan layers
QString currentArch = QSysInfo::currentCpuArchitecture(); QString currentArch = QSysInfo::currentCpuArchitecture();
@ -95,8 +96,8 @@ QString getLibraryString()
QStringList manifestNames = { QString("MangoHud.%1.json").arg(currentArch), "MangoHud.json" }; QStringList manifestNames = { QString("MangoHud.%1.json").arg(currentArch), "MangoHud.json" };
QString filePath = ""; QString filePath{};
for (QString manifestName : manifestNames) { for (const QString& manifestName : manifestNames) {
QString tryPath = FS::PathCombine(vkLayer, manifestName); QString tryPath = FS::PathCombine(vkLayer, manifestName);
if (QFile::exists(tryPath)) { if (QFile::exists(tryPath)) {
filePath = tryPath; filePath = tryPath;
@ -111,10 +112,23 @@ QString getLibraryString()
auto conf = Json::requireDocument(filePath, vkLayer); auto conf = Json::requireDocument(filePath, vkLayer);
auto confObject = Json::requireObject(conf, vkLayer); auto confObject = Json::requireObject(conf, vkLayer);
auto layer = Json::ensureObject(confObject, "layer"); auto layer = Json::ensureObject(confObject, "layer");
return Json::ensureString(layer, "library_path"); QString libraryName = Json::ensureString(layer, "library_path");
#ifdef __GLIBC__
// Check whether mangohud is usable on a glibc based system
if (!libraryName.isEmpty()) {
QString libraryPath = findLibrary(libraryName);
if (!libraryPath.isEmpty()) {
return libraryPath;
}
}
#else
// Without glibc return recorded shared library as-is.
return libraryName;
#endif
} }
return QString(); return {};
} }
QString findLibrary(QString libName) QString findLibrary(QString libName)

2
launcher/minecraft/MinecraftInstance.cpp
View File

@ -608,7 +608,7 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
// dlsym variant is only needed for OpenGL and not included in the vulkan layer // dlsym variant is only needed for OpenGL and not included in the vulkan layer
appendLib("libMangoHud_dlsym.so"); appendLib("libMangoHud_dlsym.so");
appendLib("libMangoHud_opengl.so"); appendLib("libMangoHud_opengl.so");
appendLib(mangoHudLib.fileName()); preloadList << mangoHudLibString;
} }
env.insert("LD_PRELOAD", preloadList.join(QLatin1String(":"))); env.insert("LD_PRELOAD", preloadList.join(QLatin1String(":")));