Add VK_LAYER to layer names in tests

Layer names should begin with VK_LAYER, which wasn't being done in certain
tests which this commit fixes.

diff --git a/tests/framework/layer/test_layer.cpp b/tests/framework/layer/test_layer.cpp
index a38553b4cb9b4f8830c28997fd4f9d511ce1d062..49a8d119521472d395e649607cff67f161f0000b 100644 (file)
--- a/tests/framework/layer/test_layer.cpp
+++ b/tests/framework/layer/test_layer.cpp
@@ -75,7 +75,7 @@
 #endif
 
 #if !defined(TEST_LAYER_NAME)
-#define TEST_LAYER_NAME "VkLayer_LunarG_test_layer"
+#define TEST_LAYER_NAME "VK_LAYER_LunarG_test_layer"
 #endif
 
 TestLayer layer;

diff --git a/tests/loader_alloc_callback_tests.cpp b/tests/loader_alloc_callback_tests.cpp
index 45376f291b14ccfa22ed5abe9b23f26bd89729d3..dffbf467b6f3ca1cd0aad2932c01e80dd5b70258 100644 (file)
--- a/tests/loader_alloc_callback_tests.cpp
+++ b/tests/loader_alloc_callback_tests.cpp
@@ -701,7 +701,7 @@ TEST(Allocation, CreateInstanceDeviceIntentionalAllocFail) {
     custom_json_file_contents << custom_json_file.rdbuf();
 
     fs::path new_path = env.get_folder(ManifestLocation::explicit_layer)
-                            .write_manifest("VkLayer_complex_file.json", custom_json_file_contents.str());
+                            .write_manifest("VK_LAYER_complex_file.json", custom_json_file_contents.str());
     env.platform_shim->add_manifest(ManifestCategory::explicit_layer, new_path);
 
     size_t fail_index = 0;

diff --git a/tests/loader_layer_tests.cpp b/tests/loader_layer_tests.cpp
index 53fda87fc122f8f881a450f470e8cfc427c1abdd..28281dee1eee24267ca2bcc58eae7834a11f5e2f 100644 (file)
--- a/tests/loader_layer_tests.cpp
+++ b/tests/loader_layer_tests.cpp
@@ -92,7 +92,7 @@ TEST(ImplicitLayers, WithEnableAndDisableEnvVar) {
 TEST(ImplicitLayers, OnlyDisableEnvVar) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
-    const char* implicit_layer_name = "ImplicitTestLayer";
+    const char* implicit_layer_name = "VK_LAYER_ImplicitTestLayer";
     EnvVarWrapper disable_env_var{"DISABLE_ME"};
 
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
@@ -127,7 +127,7 @@ TEST(ImplicitLayers, OnlyDisableEnvVar) {
 TEST(ImplicitLayers, PreInstanceEnumInstLayerProps) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
-    const char* implicit_layer_name = "ImplicitTestLayer";
+    const char* implicit_layer_name = "VK_LAYER_ImplicitTestLayer";
     EnvVarWrapper disable_env_var{"DISABLE_ME"};
 
     env.add_implicit_layer(
@@ -161,7 +161,7 @@ TEST(ImplicitLayers, PreInstanceEnumInstLayerProps) {
 TEST(ImplicitLayers, PreInstanceEnumInstExtProps) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
-    const char* implicit_layer_name = "ImplicitTestLayer";
+    const char* implicit_layer_name = "VK_LAYER_ImplicitTestLayer";
     EnvVarWrapper disable_env_var{"DISABLE_ME"};
 
     env.add_implicit_layer(
@@ -198,7 +198,7 @@ TEST(ImplicitLayers, PreInstanceVersion) {
         .add_physical_device({})
         .set_icd_api_version(VK_MAKE_API_VERSION(0, 1, 2, 3));
 
-    const char* implicit_layer_name = "ImplicitTestLayer";
+    const char* implicit_layer_name = "VK_LAYER_ImplicitTestLayer";
     EnvVarWrapper disable_env_var{"DISABLE_ME"};
 
     env.add_implicit_layer(ManifestLayer{}.set_file_format_version({1, 1, 2}).add_layer(
@@ -237,7 +237,7 @@ TEST(ImplicitLayers, OverrideGetInstanceProcAddr) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA)).add_physical_device({});
 
-    const char* implicit_layer_name = "ImplicitTestLayer";
+    const char* implicit_layer_name = "VK_LAYER_ImplicitTestLayer";
     EnvVarWrapper disable_env_var{"DISABLE_ME"};
 
     env.add_implicit_layer(ManifestLayer{}.set_file_format_version({1, 0, 0}).add_layer(
@@ -1873,7 +1873,7 @@ TEST(LayerCreateInstance, GetPhysicalDeviceProperties2) {
         .add_physical_device({})
         .set_icd_api_version(VK_API_VERSION_1_1);
 
-    const char* regular_layer_name = "TestLayer";
+    const char* regular_layer_name = "VK_LAYER_TestLayer";
     env.add_explicit_layer(
         ManifestLayer{}.set_file_format_version({1, 1, 2}).add_layer(
             ManifestLayer::LayerDescription{}.set_name(regular_layer_name).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -1973,13 +1973,13 @@ TEST(ExplicitLayers, WrapObjects) {
                                ManifestLayer::LayerDescription{}.set_name(wrap_objects_name).set_lib_path(TEST_LAYER_WRAP_OBJECTS)),
                            "wrap_objects_layer.json");
 
-    const char* regular_layer_name_1 = "RegularLayer1";
+    const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
     env.add_explicit_layer(
         ManifestLayer{}.add_layer(
             ManifestLayer::LayerDescription{}.set_name(regular_layer_name_1).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
         "regular_layer_1.json");
 
-    const char* regular_layer_name_2 = "RegularLayer2";
+    const char* regular_layer_name_2 = "VK_LAYER_RegularLayer2";
     env.add_explicit_layer(
         ManifestLayer{}.add_layer(
             ManifestLayer::LayerDescription{}.set_name(regular_layer_name_2).set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -2029,7 +2029,7 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
 
     {
         // verify layer loads successfully when setting VK_LAYER_PATH to a full filepath
-        const char* regular_layer_name_1 = "RegularLayer1";
+        const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
         env.add_explicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                               .set_name(regular_layer_name_1)
                                                                               .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -2045,7 +2045,7 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
     }
     {
         // verify layers load successfully when setting VK_LAYER_PATH to multiple full filepaths
-        const char* regular_layer_name_1 = "RegularLayer1";
+        const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
         env.add_explicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                               .set_name(regular_layer_name_1)
                                                                               .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -2053,7 +2053,7 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
                                    .set_discovery_type(ManifestDiscoveryType::env_var)
                                    .set_is_dir(false));
 
-        const char* regular_layer_name_2 = "RegularLayer2";
+        const char* regular_layer_name_2 = "VK_LAYER_RegularLayer2";
         env.add_explicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                               .set_name(regular_layer_name_2)
                                                                               .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -2070,14 +2070,14 @@ TEST(ExplicitLayers, VkLayerPathEnvVar) {
     }
     {
         // verify layers load successfully when setting VK_LAYER_PATH to a directory
-        const char* regular_layer_name_1 = "RegularLayer1";
+        const char* regular_layer_name_1 = "VK_LAYER_RegularLayer1";
         env.add_explicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                               .set_name(regular_layer_name_1)
                                                                               .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
                                                 "regular_layer_1.json")
                                    .set_discovery_type(ManifestDiscoveryType::env_var));
 
-        const char* regular_layer_name_2 = "RegularLayer2";
+        const char* regular_layer_name_2 = "VK_LAYER_RegularLayer2";
         env.add_explicit_layer(TestLayerDetails(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
                                                                               .set_name(regular_layer_name_2)
                                                                               .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)),
@@ -4350,7 +4350,7 @@ TEST(LayerPhysDeviceMod, AddPhysicalDevices) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_add_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_add_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_ADD_PHYS_DEV")),
@@ -4427,7 +4427,7 @@ TEST(LayerPhysDeviceMod, RemovePhysicalDevices) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_remove_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_remove_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_REMOVE_PHYS_DEV")),
@@ -4477,7 +4477,7 @@ TEST(LayerPhysDeviceMod, ReorderPhysicalDevices) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_reorder_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_reorder_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_REORDER_PHYS_DEV")),
@@ -4527,7 +4527,7 @@ TEST(LayerPhysDeviceMod, AddRemoveAndReorderPhysicalDevices) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_all_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_all_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_ALL_PHYS_DEV")),
@@ -4603,7 +4603,7 @@ TEST(LayerPhysDeviceMod, AddPhysicalDeviceGroups) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_add_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_add_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_ADD_PHYS_DEV")),
@@ -4691,7 +4691,7 @@ TEST(LayerPhysDeviceMod, RemovePhysicalDeviceGroups) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_remove_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_remove_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_REMOVE_PHYS_DEV")),
@@ -4744,7 +4744,7 @@ TEST(LayerPhysDeviceMod, ReorderPhysicalDeviceGroups) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_reorder_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_reorder_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_REORDER_PHYS_DEV")),
@@ -4797,7 +4797,7 @@ TEST(LayerPhysDeviceMod, AddRemoveAndReorderPhysicalDeviceGroups) {
     FrameworkEnvironment env;
     env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2_EXPORT_ICD_GPDPA));
     env.add_implicit_layer(ManifestLayer{}.add_layer(ManifestLayer::LayerDescription{}
-                                                         .set_name("VkLayer_LunarG_all_phys_dev")
+                                                         .set_name("VK_LAYER_LunarG_all_phys_dev")
                                                          .set_lib_path(TEST_LAYER_PATH_EXPORT_VERSION_2)
                                                          .set_api_version(VK_API_VERSION_1_1)
                                                          .set_disable_environment("TEST_DISABLE_ALL_PHYS_DEV")),