Silence warnings for wrong manifest type

If the loader happens upon a layer/ICD manifest while searching for manifests
of the opposite type, do not emit warnings. These are spurious and only cause
users to think something is wrong with the installation when it is actually
fine.

Author: charles-lunarg

loader/loader.c

@@ -2891,9 +2891,13 @@ VkResult loader_add_layer_properties(const struct loader_instance *inst, struct
         // Otherwise, try to read in individual layers
         cJSON *layer_node = loader_cJSON_GetObjectItem(json, "layer");
         if (layer_node == NULL) {
-            loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0,
-                       "loader_add_layer_properties: Can not find 'layer' object in manifest JSON file %s.  Skipping this file.",
-                       filename);
+            // Don't warn if this happens to be an ICD manifest
+            if (loader_cJSON_GetObjectItem(json, "ICD") == NULL) {
+                loader_log(
+                    inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0,
+                    "loader_add_layer_properties: Can not find 'layer' object in manifest JSON file %s.  Skipping this file.",
+                    filename);
+            }
             goto out;
         }
         // Loop through all "layer" objects in the file to get a count of them
@@ -3609,8 +3613,12 @@ VkResult loader_parse_icd_manifest(const struct loader_instance *inst, char *fil
 
     cJSON *itemICD = loader_cJSON_GetObjectItem(icd_manifest_json, "ICD");
     if (itemICD == NULL) {
-        loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_DRIVER_BIT, 0,
-                   "loader_parse_icd_manifest: Can not find \'ICD\' object in ICD JSON file %s. Skipping ICD JSON", file_str);
+        // Don't warn if this happens to be a layer manifest file
+        if (loader_cJSON_GetObjectItem(icd_manifest_json, "layer") == NULL &&
+            loader_cJSON_GetObjectItem(icd_manifest_json, "layers") == NULL) {
+            loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_DRIVER_BIT, 0,
+                       "loader_parse_icd_manifest: Can not find \'ICD\' object in ICD JSON file %s. Skipping ICD JSON", file_str);
+        }
         res = VK_ERROR_INCOMPATIBLE_DRIVER;
         goto out;
     }

tests/framework/test_environment.cpp

@@ -697,7 +697,7 @@ void FrameworkEnvironment::add_layer_impl(TestLayerDetails layer_details, Manife
         }
 #if defined(_WIN32)
         if (layer_details.discovery_type == ManifestDiscoveryType::windows_app_package) {
-            platform_shim->set_app_package_path(layer_manifest_loc);
+            platform_shim->set_app_package_path(folder.location());
         }
 #endif
         for (size_t i = new_layers_start; i < layers.size(); i++) {

tests/loader_regression_tests.cpp

@@ -3813,9 +3813,9 @@ TEST(AppPackageDiscovery, AppPackageDrivers) {
 }
 TEST(AppPackageDiscovery, AppPackageLayers) {
     FrameworkEnvironment env{};
-    env.add_icd(TestICDDetails(ManifestICD{}.set_lib_path(TEST_ICD_PATH_VERSION_2)));
+    env.add_icd(TestICDDetails(ManifestICD{}.set_lib_path(TEST_ICD_PATH_VERSION_2))).add_physical_device({});
 
-    const char* layer_name = "test_package_layer";
+    const char* layer_name = "VK_LAYER_test_package_layer";
     env.add_implicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                           .set_name(layer_name)
                                                                           .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
@@ -3826,14 +3826,30 @@ TEST(AppPackageDiscovery, AppPackageLayers) {
     InstWrapper inst{env.vulkan_functions};
     inst.CheckCreate();
 
-    {
-        VkLayerProperties layer_props{};
-        uint32_t layer_count = 0;
-        ASSERT_EQ(VK_SUCCESS, env.vulkan_functions.vkEnumerateInstanceLayerProperties(&layer_count, NULL));
-        ASSERT_EQ(layer_count, 1);
-        ASSERT_EQ(VK_SUCCESS, env.vulkan_functions.vkEnumerateInstanceLayerProperties(&layer_count, &layer_props));
-        ASSERT_TRUE(string_eq(layer_name, layer_props.layerName));
-    }
+    auto layers = inst.GetActiveLayers(inst.GetPhysDev(), 1U);
+    ASSERT_EQ(layers.size(), 1);
+    ASSERT_TRUE(string_eq(layers.at(0).layerName, layer_name));
+}
+
+TEST(AppPackageDiscovery, AppPackageICDAndLayers) {
+    FrameworkEnvironment env{};
+    env.add_icd(TestICDDetails{TEST_ICD_PATH_VERSION_2}.set_discovery_type(ManifestDiscoveryType::windows_app_package))
+        .add_physical_device({});
+
+    const char* layer_name = "VK_LAYER_test_package_layer";
+    env.add_implicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
+                                                                          .set_name(layer_name)
+                                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
+                                                                          .set_disable_environment("DISABLE_ME")),
+                                            "test_package_layer.json")
+                               .set_discovery_type(ManifestDiscoveryType::windows_app_package));
+
+    InstWrapper inst{env.vulkan_functions};
+    inst.CheckCreate();
+
+    auto layers = inst.GetActiveLayers(inst.GetPhysDev(), 1U);
+    ASSERT_EQ(layers.size(), 1);
+    ASSERT_TRUE(string_eq(layers.at(0).layerName, layer_name));
 }
 
 // Make sure that stale layer manifests (path to nonexistant file) which have the same name as real manifests don't cause the real