From: phish3y Date: Tue, 22 Nov 2022 22:55:16 +0000 (-0800) Subject: Layers: add test to verify VK_LAYER_PATH supports explicit file paths instead of... X-Git-Tag: upstream/1.3.240~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbcafdc4048fed893f4523d626d1d10d5bb97e8a;p=platform%2Fupstream%2FVulkan-Loader.git Layers: add test to verify VK_LAYER_PATH supports explicit file paths instead of just directories --- diff --git a/tests/loader_layer_tests.cpp b/tests/loader_layer_tests.cpp index 32a0850b..0277adda 100644 --- a/tests/loader_layer_tests.cpp +++ b/tests/loader_layer_tests.cpp @@ -1035,6 +1035,7 @@ TEST(MetaLayers, ExplicitMetaLayer) { ManifestLayer{}.add_layer( ManifestLayer::LayerDescription{}.set_name(regular_layer_name).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)), "regular_test_layer.json"); + { // global functions // should find 1, the 'regular' layer uint32_t layer_count = 0; @@ -1076,6 +1077,23 @@ TEST(MetaLayers, ExplicitMetaLayer) { ASSERT_EQ(count, 2U); EXPECT_TRUE(check_permutation({regular_layer_name, meta_layer_name}, layer_props)); } + { + const char* env_var_layer_name = "meta_test_layer.json:regular_test_layer.json"; + env.add_explicit_layer(TestLayerDetails{ManifestLayer{} + .set_file_format_version(ManifestVersion(1, 2, 0)) + .add_layer(ManifestLayer::LayerDescription{} + .set_name(env_var_layer_name) + .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2) + .set_api_version(VK_MAKE_API_VERSION(0, 1, 0, 0))), + env_var_layer_name} + .set_discovery_type(ManifestDiscoveryType::env_var)); + InstWrapper inst(env.vulkan_functions); + inst.CheckCreate(VK_SUCCESS); + inst.create_info.add_layer(env_var_layer_name); + uint32_t count = 0; + env.vulkan_functions.vkEnumerateInstanceLayerProperties(&count, nullptr); + ASSERT_EQ(count, 1U); + } } // Meta layer which adds itself in its list of component layers