bugfix vulkan layers

hitman249 · Apr 7, 2020 · c140a39 · c140a39
1 parent d87a2e2
commit c140a39
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/src/src/modules/command.js b/src/src/modules/command.js
@@ -173,11 +173,24 @@ export default class Command {
             }
 
             let preloaded = [];
+            let vkLayers  = [];
 
             if (this.prefix.isVkBasalt() && this.prefix.isVkBasaltLib()) {
                 exported.ENABLE_VKBASALT      = 1;
                 exported.VKBASALT_CONFIG_FILE = this.prefix.getVkBasaltConfFile();
                 exported.VKBASALT_LOG_FILE    = this.prefix.getLogFileVkBasalt();
+
+                let vkBasalt = window.app.getVkBasalt();
+
+                vkLayers.push(vkBasalt.getLayer32().layer.name);
+                vkLayers.push(vkBasalt.getLayer64().layer.name);
+            }
+
+            if (this.prefix.isMangoHud()) {
+                let mangoHud = window.app.getMangoHud();
+
+                vkLayers.push(mangoHud.getLayer32().layer.name);
+                vkLayers.push(mangoHud.getLayer64().layer.name);
             }
 
             if (this.config) {
@@ -191,6 +204,10 @@ export default class Command {
             if (preloaded.length > 0) {
                 exported.LD_PRELOAD = '$LD_PRELOAD:' + preloaded.join(':');
             }
+
+            if (vkLayers.length > 0) {
+                exported.VK_INSTANCE_LAYERS = '$VK_INSTANCE_LAYERS:' + vkLayers.join(':');
+            }
         }
 
         let env = Object.keys(exported).map((field) => `export ${field}="${exported[field]}"`).join('; ');

diff --git a/src/src/modules/mango-hud.js b/src/src/modules/mango-hud.js
@@ -64,13 +64,8 @@ export default class MangoHud {
             return promise;
         }
 
-        if (!this.fs.exists(file32)) {
-            this.fs.filePutContents(file32, Utils.jsonEncode(this.getLayer32()));
-        }
-
-        if (!this.fs.exists(file64)) {
-            this.fs.filePutContents(file64, Utils.jsonEncode(this.getLayer64()));
-        }
+        this.fs.filePutContents(file32, Utils.jsonEncode(this.getLayer32()));
+        this.fs.filePutContents(file64, Utils.jsonEncode(this.getLayer64()));
 
         let win32 = this.prefix.getMangoHudLibPath('win32');
 
@@ -91,7 +86,7 @@ export default class MangoHud {
         return {
             "file_format_version": "1.0.0",
             "layer":               {
-                "name":                   "MangoHud x86",
+                "name":                   "VK_LAYER_MangoHud_32",
                 "type":                   "GLOBAL",
                 "api_version":            "1.1.125",
                 "library_path":           this.prefix.getMangoHudLibPath('win32'),
@@ -115,7 +110,7 @@ export default class MangoHud {
         return {
             "file_format_version": "1.0.0",
             "layer":               {
-                "name":                   "MangoHud x86_64",
+                "name":                   "VK_LAYER_MangoHud_64",
                 "type":                   "GLOBAL",
                 "api_version":            "1.1.125",
                 "library_path":           this.prefix.getMangoHudLibPath('win64'),

diff --git a/src/src/modules/vk-basalt.js b/src/src/modules/vk-basalt.js
@@ -69,17 +69,8 @@ export default class VkBasalt {
             this.fs.filePutContents(config, this.getConfig());
         }
 
-        if (!this.fs.exists(file32)) {
-            this.fs.filePutContents(file32, Utils.jsonEncode(this.getLayer32()));
-        }
-
-        if (!this.fs.exists(file64)) {
-            this.fs.filePutContents(file64, Utils.jsonEncode(this.getLayer64()));
-        }
-
-        if (!this.fs.exists(file64)) {
-            this.fs.filePutContents(file64, Utils.jsonEncode(this.getLayer64()));
-        }
+        this.fs.filePutContents(file32, Utils.jsonEncode(this.getLayer32()));
+        this.fs.filePutContents(file64, Utils.jsonEncode(this.getLayer64()));
 
         let win32 = this.prefix.getVkBasaltLibPath('win32');