vkconfig3: Loader workaround for disables layers

Change-Id: Ifefdf194d856b03060fa7355d28bfe7322f479e6
LunarG · Nov 4, 2024 · 65a1f86 · 65a1f86
1 parent 94e6485
commit 65a1f86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/vkconfig_core/configuration.cpp b/vkconfig_core/configuration.cpp
@@ -41,7 +41,7 @@
 #include <string>
 #include <algorithm>
 
-static void AddApplicationEnabledParameters(std::vector<Parameter>& parameters) {
+static void AddApplicationEnabledParameters(std::vector<Parameter>& parameters, LayerControl default_control) {
     bool found_applications_api = false;
     for (auto paramater : parameters) {
         if (paramater.builtin != LAYER_BUILTIN_API) {
@@ -495,7 +495,7 @@ void Configuration::GatherParameters(const LayerManager& layers) {
         gathered_parameters.push_back(parameter);
     }
 
-    ::AddApplicationEnabledParameters(gathered_parameters);
+    ::AddApplicationEnabledParameters(gathered_parameters, this->default_control);
 
     ::OrderParameter(gathered_parameters, layers);
 

diff --git a/vkconfig_core/configurations/3.0.0/Disable All Vulkan Layers.json b/vkconfig_core/configurations/3.0.0/Disable All Vulkan Layers.json
@@ -20,32 +20,6 @@
             "perf",
             "layer",
             "driver"
-        ],
-        "layers": [
-            {
-                "builtin": "unordered_layer_location",
-                "platforms": [
-                    "WINDOWS",
-                    "LINUX",
-                    "MACOS"
-                ],
-                "rank": -1,
-                "settings": [
-                ],
-                "version": "latest"
-            },
-            {
-                "builtin": "application_enabled_layers",
-                "platforms": [
-                    "WINDOWS",
-                    "LINUX",
-                    "MACOS"
-                ],
-                "rank": -1,
-                "settings": [
-                ],
-                "version": "latest"
-            }
         ]
     }
 }