From 4055e34320e738753a6e8f5431790f078daf974b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 1 Apr 2023 12:56:09 -0400
Subject: [PATCH] chore: use system architecture to detect vulkan layers

Signed-off-by: seth <getchoo@tuta.io>
---
 launcher/MangoHud.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/launcher/MangoHud.cpp b/launcher/MangoHud.cpp
index 890aca57..90e48e29 100644
--- a/launcher/MangoHud.cpp
+++ b/launcher/MangoHud.cpp
@@ -19,6 +19,7 @@
 #include <QStringList>
 #include <QDir>
 #include <QString>
+#include <QSysInfo>
 #include <QtGlobal>
 
 #include "MangoHud.h"
@@ -76,7 +77,13 @@ QString getLibraryString()
 
     for (QString vkLayer : vkLayerList) {
         // prefer to use architecture specific vulkan layers
-        QStringList manifestNames = { "MangoHud.x86_64.json", "MangoHud.aarch64.json", "MangoHud.json" };
+        QString currentArch = QSysInfo::currentCpuArchitecture();
+
+        if (currentArch == "arm64") {
+            currentArch = "aarch64";
+        }
+
+        QStringList manifestNames = { QString("MangoHud.%1.json").arg(currentArch), "MangoHud.json" };
 
         QString filePath = "";
         for (QString manifestName : manifestNames) {
@@ -87,8 +94,9 @@ QString getLibraryString()
             }
         }
 
-        if (filePath.isEmpty())
+        if (filePath.isEmpty()) {
             continue;
+        }
 
         auto conf = Json::requireDocument(filePath, vkLayer);
         auto confObject = Json::requireObject(conf, vkLayer);