From: phish3y <logsdonevan1@gmail.com>
Date: Wed, 30 Nov 2022 22:28:19 +0000 (-0800)
Subject: Layers: expand tests to check layer names loaded are expected
X-Git-Tag: upstream/1.3.240~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92bbe8e0006cceae5b4abc3babcbfc8a785b180f;p=platform%2Fupstream%2FVulkan-Loader.git

Layers: expand tests to check layer names loaded are expected
---

diff --git a/tests/loader_layer_tests.cpp b/tests/loader_layer_tests.cpp
index 4bbd351c..69f55be8 100644
--- a/tests/loader_layer_tests.cpp
+++ b/tests/loader_layer_tests.cpp
@@ -2112,6 +2112,10 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
         uint32_t count = 0;
         env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, nullptr);
         ASSERT_EQ(count, 1U);
+
+        VkLayerProperties layer_props;
+        env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, &layer_props);
+        EXPECT_TRUE(string_eq(layer_props.layerName, regular_layer_name_1));
     }
     { 
         // verify layers load successfully when setting VK_LAYER_PATH to multiple full filepaths
@@ -2137,6 +2141,10 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
         uint32_t count = 0;
         env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, nullptr);
         ASSERT_EQ(count, 2U);
+
+        std::array<VkLayerProperties, 2> layer_props;
+        env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, layer_props.data());
+        EXPECT_TRUE(check_permutation({regular_layer_name_1, regular_layer_name_2}, layer_props));
     }
     { 
         // verify layers load successfully when setting VK_LAYER_PATH to a directory
@@ -2162,6 +2170,10 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
         uint32_t count = 0;
         env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, nullptr);
         ASSERT_EQ(count, 2U);
+
+        std::array<VkLayerProperties, 2> layer_props;
+        env.vulkan_functions.vkEnumerateDeviceLayerProperties(phys_dev, &count, layer_props.data());
+        EXPECT_TRUE(check_permutation({regular_layer_name_1, regular_layer_name_2}, layer_props));
     }
 }