Fix env-var filtering in layer enumeration

Disabled layers would appear in the output of EnumerateInstanceLayers, which was
not intended. Move the removal of layers that are disabled by the env-var to after
the explicit layers are found.

3 files changed, 61 insertions, 31 deletions

diff --git a/loader/loader.c b/loader/loader.c
index ab17961ec..1711368fd 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -3631,14 +3631,6 @@ VkResult loader_scan_for_layers(struct loader_instance *inst, struct loader_laye
         }
     }
 
-    // Remove disabled layers
-    for (uint32_t i = 0; i < instance_layers->count; ++i) {
-        if (!loader_layer_is_available(inst, &enable_filter, &disable_filter, &instance_layers->list[i])) {
-            loader_remove_layer_in_list(inst, instance_layers, i);
-            i--;
-        }
-    }
-
     // Get a list of manifest files for explicit layers
     res = loader_get_data_files(inst, LOADER_DATA_FILE_MANIFEST_EXPLICIT_LAYER, override_paths, &manifest_files);
     if (VK_SUCCESS != res) {
@@ -3685,6 +3677,14 @@ VkResult loader_scan_for_layers(struct loader_instance *inst, struct loader_laye
         }
     }
 
+    // Remove disabled layers
+    for (uint32_t i = 0; i < instance_layers->count; ++i) {
+        if (!loader_layer_is_available(inst, &enable_filter, &disable_filter, &instance_layers->list[i])) {
+            loader_remove_layer_in_list(inst, instance_layers, i);
+            i--;
+        }
+    }
+
 out:
 
     loader_instance_heap_free(inst, override_paths);
diff --git a/tests/framework/test_util.h b/tests/framework/test_util.h
index 7ff100aae..e958c1139 100644
--- a/tests/framework/test_util.h
+++ b/tests/framework/test_util.h
@@ -852,29 +852,19 @@ template <typename T, size_t U>
 bool check_permutation(std::initializer_list<const char*> expected, std::array<T, U> const& returned) {
     if (expected.size() != returned.size()) return false;
     for (uint32_t i = 0; i < expected.size(); i++) {
-        bool found = false;
-        for (auto& elem : returned) {
-            if (string_eq(*(expected.begin() + i), elem.layerName)) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) return false;
+        auto found = std::find_if(std::begin(returned), std::end(returned),
+                                  [&](T elem) { return string_eq(*(expected.begin() + i), elem.layerName); });
+        if (found == std::end(returned)) return false;
     }
     return true;
 }
-template <typename T, size_t U>
+template <typename T>
 bool check_permutation(std::initializer_list<const char*> expected, std::vector<T> const& returned) {
     if (expected.size() != returned.size()) return false;
     for (uint32_t i = 0; i < expected.size(); i++) {
-        bool found = false;
-        for (auto& elem : returned) {
-            if (string_eq(*(expected.begin() + i), elem.layerName)) {
-                found = true;
-                break;
-            }
-        }
-        if (!found) return false;
+        auto found = std::find_if(std::begin(returned), std::end(returned),
+                                  [&](T elem) { return string_eq(*(expected.begin() + i), elem.layerName); });
+        if (found == std::end(returned)) return false;
     }
     return true;
 }
diff --git a/tests/loader_layer_tests.cpp b/tests/loader_layer_tests.cpp
index 339d46ff5..54e0b2043 100644
--- a/tests/loader_layer_tests.cpp
+++ b/tests/loader_layer_tests.cpp
@@ -1250,9 +1250,9 @@ TEST(OverrideMetaLayer, InvalidDisableEnvironment) {
                                               .set_name(lunarg_meta_layer_name)
                                               .set_api_version(VK_MAKE_API_VERSION(0, 1, 1, 0))
                                               .add_component_layers({regular_layer_name})),
-                            "meta_test_layer.json");
+                           "meta_test_layer.json");
 
-     uint32_t layer_count = 0;
+    uint32_t layer_count = 0;
     EXPECT_EQ(VK_SUCCESS, env.vulkan_functions.vkEnumerateInstanceLayerProperties(&layer_count, nullptr));
     EXPECT_EQ(layer_count, 1U);
 
@@ -1263,7 +1263,7 @@ TEST(OverrideMetaLayer, InvalidDisableEnvironment) {
 
     InstWrapper inst{env.vulkan_functions};
     inst.CheckCreate();
- }
+}
 
 // Override meta layer whose version is less than the api version of the instance
 TEST(OverrideMetaLayer, OlderVersionThanInstance) {
@@ -1571,8 +1571,17 @@ TEST(OverrideMetaLayer, ApplicationEnabledLayerInBlacklist) {
                                               .add_blacklisted_layer(manual_regular_layer_name)
                                               .set_disable_environment("DisableMeIfYouCan")),
                            "meta_test_layer.json");
-
-    {  // enable the layer in the blacklist
+    {  // Check that enumerating the layers returns only the non-blacklisted layers + override layer
+        uint32_t count = 0;
+        env.vulkan_functions.vkEnumerateInstanceLayerProperties(&count, nullptr);
+        ASSERT_EQ(count, 2U);
+        std::vector<VkLayerProperties> layer_props{2, VkLayerProperties{}};
+        env.vulkan_functions.vkEnumerateInstanceLayerProperties(&count, layer_props.data());
+        ASSERT_EQ(count, 2U);
+        ASSERT_TRUE(check_permutation({automatic_regular_layer_name, lunarg_meta_layer_name}, layer_props));
+    }
+    {
+        // enable the layer in the blacklist
         InstWrapper inst{env.vulkan_functions};
         FillDebugUtilsCreateDetails(inst.create_info, env.debug_log);
         inst.create_info.add_layer(manual_regular_layer_name);
@@ -4183,7 +4192,7 @@ TEST(TestLayers, EnvironVkInstancdAndDisableFilters) {
     InstWrapper inst3{env.vulkan_functions};
     inst3.create_info.add_layer(explicit_layer_name_1);
     FillDebugUtilsCreateDetails(inst3.create_info, env.debug_log);
-    inst2.CheckCreate();
+    inst3.CheckCreate();
 
     ASSERT_TRUE(FindPrefixPostfixStringOnLine(env.debug_log, "Found manifest file", explicit_json_name_1));
     ASSERT_FALSE(FindPrefixPostfixStringOnLine(env.debug_log, "Insert instance layer", explicit_layer_name_1));
@@ -4200,6 +4209,37 @@ TEST(TestLayers, EnvironVkInstancdAndDisableFilters) {
     remove_env_var("VK_LOADER_LAYERS_DISABLE");
 }
 
+TEST(TestLayers, AppEnabledExplicitLayerFails) {
+    FrameworkEnvironment env;
+    env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA, VK_MAKE_API_VERSION(0, 1, 2, 0)));
+    env.get_test_icd().icd_api_version = VK_MAKE_API_VERSION(0, 1, 2, 0);
+
+    const char* explicit_layer_name_1 = "VK_LAYER_LUNARG_First_layer";
+    const char* explicit_json_name_1 = "First_layer.json";
+    env.add_explicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
+                                                         .set_name(explicit_layer_name_1)
+                                                         .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
+                                                         .set_api_version(VK_MAKE_API_VERSION(0, 1, 0, 0))),
+                           explicit_json_name_1);
+
+    env.debug_log.clear();
+    set_env_var("VK_LOADER_LAYERS_DISABLE", explicit_layer_name_1);
+
+    uint32_t count = 0;
+    env.vulkan_functions.vkEnumerateInstanceLayerProperties(&count, nullptr);
+    EXPECT_EQ(count, 0);
+    std::vector<VkLayerProperties> layers;
+    layers.resize(1);
+    env.vulkan_functions.vkEnumerateInstanceLayerProperties(&count, layers.data());
+    EXPECT_EQ(count, 0);
+
+    InstWrapper inst3{env.vulkan_functions};
+    inst3.create_info.add_layer(explicit_layer_name_1);
+    FillDebugUtilsCreateDetails(inst3.create_info, env.debug_log);
+    inst3.CheckCreate(VK_ERROR_LAYER_NOT_PRESENT);
+
+    remove_env_var("VK_LOADER_LAYERS_DISABLE");
+}
 // Add a device layer, should not work
 TEST(TestLayers, DoNotUseDeviceLayer) {
     FrameworkEnvironment env;