From 661037ec6362d8403681311ae9b8bf88e3f0f1a2 Mon Sep 17 00:00:00 2001 From: Charles Giessen Date: Thu, 20 Jul 2023 13:51:14 -0600 Subject: [PATCH] Remove unecessary version setting in tests The default value is 1.0, so it isn't necessary to set it. --- tests/loader_phys_dev_inst_ext_tests.cpp | 20 -------------------- tests/loader_wsi_tests.cpp | 20 -------------------- 2 files changed, 40 deletions(-) diff --git a/tests/loader_phys_dev_inst_ext_tests.cpp b/tests/loader_phys_dev_inst_ext_tests.cpp index 8260fd8..425dfc1 100644 --- a/tests/loader_phys_dev_inst_ext_tests.cpp +++ b/tests/loader_phys_dev_inst_ext_tests.cpp @@ -304,8 +304,6 @@ TEST(LoaderInstPhysDevExts, PhysDevProps2Mixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -672,8 +670,6 @@ TEST(LoaderInstPhysDevExts, PhysDevFeatsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -957,8 +953,6 @@ TEST(LoaderInstPhysDevExts, PhysDevFormatPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -1336,8 +1330,6 @@ TEST(LoaderInstPhysDevExts, PhysDevImageFormatPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -1645,8 +1637,6 @@ TEST(LoaderInstPhysDevExts, PhysDevMemoryPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -1993,8 +1983,6 @@ TEST(LoaderInstPhysDevExts, PhysDevQueueFamilyPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -2412,8 +2400,6 @@ TEST(LoaderInstPhysDevExts, PhysDevSparseImageFormatPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -2679,8 +2665,6 @@ TEST(LoaderInstPhysDevExts, PhysDevExtBufPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -2941,8 +2925,6 @@ TEST(LoaderInstPhysDevExts, PhysDevExtSemPropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; @@ -3202,8 +3184,6 @@ TEST(LoaderInstPhysDevExts, PhysDevExtFencePropsMixed) { if (icd != 1) { cur_icd.icd_api_version = VK_API_VERSION_1_1; cur_icd.add_instance_extension({VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME}); - } else { - cur_icd.icd_api_version = VK_API_VERSION_1_0; } uint32_t rand_vendor_id; diff --git a/tests/loader_wsi_tests.cpp b/tests/loader_wsi_tests.cpp index 25e9800..99e8bcb 100644 --- a/tests/loader_wsi_tests.cpp +++ b/tests/loader_wsi_tests.cpp @@ -37,7 +37,6 @@ TEST(WsiTests, CreateSurfaceWin32NoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); InstWrapper inst{env.vulkan_functions}; inst.create_info.add_extensions({VK_KHR_WIN32_SURFACE_EXTENSION_NAME}); @@ -55,7 +54,6 @@ TEST(WsiTests, CreateSurfaceWin32NoICDCreateSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WIN32_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = false; @@ -78,7 +76,6 @@ TEST(WsiTests, CreateSurfaceWin32ICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WIN32_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = true; @@ -128,7 +125,6 @@ TEST(WsiTests, GetPhysicalDeviceWin32PresentNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WIN32_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -156,7 +152,6 @@ TEST(WsiTests, GetPhysicalDeviceWin32PresentICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WIN32_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -221,7 +216,6 @@ TEST(WsiTests, CreateSurfaceXCBNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.enable_icd_wsi = false; InstWrapper inst{env.vulkan_functions}; @@ -240,7 +234,6 @@ TEST(WsiTests, CreateSurfaceXCBNoICDCreateSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XCB_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = false; @@ -264,7 +257,6 @@ TEST(WsiTests, CreateSurfaceXCBICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XCB_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = true; @@ -316,7 +308,6 @@ TEST(WsiTests, GetPhysicalDeviceXcbPresentNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XCB_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -344,7 +335,6 @@ TEST(WsiTests, GetPhysicalDeviceXcbPresentICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XCB_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -409,7 +399,6 @@ TEST(WsiTests, CreateSurfaceXLIBNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.enable_icd_wsi = false; InstWrapper inst{env.vulkan_functions}; @@ -428,7 +417,6 @@ TEST(WsiTests, CreateSurfaceXLIBNoICDCreateSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XLIB_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = false; @@ -452,7 +440,6 @@ TEST(WsiTests, CreateSurfaceXLIBICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XLIB_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = true; @@ -504,7 +491,6 @@ TEST(WsiTests, GetPhysicalDeviceXlibPresentNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XLIB_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -532,7 +518,6 @@ TEST(WsiTests, GetPhysicalDeviceXlibPresentICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_XLIB_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -597,7 +582,6 @@ TEST(WsiTests, CreateSurfaceWaylandNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.enable_icd_wsi = false; InstWrapper inst{env.vulkan_functions}; @@ -616,7 +600,6 @@ TEST(WsiTests, CreateSurfaceWaylandNoICDCreateSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = false; @@ -640,7 +623,6 @@ TEST(WsiTests, CreateSurfaceWaylandICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME}); cur_icd.enable_icd_wsi = true; @@ -692,7 +674,6 @@ TEST(WsiTests, GetPhysicalDeviceWaylandPresentNoICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); @@ -720,7 +701,6 @@ TEST(WsiTests, GetPhysicalDeviceWaylandPresentICDSupport) { env.add_icd(TestICDDetails(TEST_ICD_PATH_VERSION_2)); auto& cur_icd = env.get_test_icd(0); cur_icd.set_min_icd_interface_version(5); - cur_icd.set_icd_api_version(VK_API_VERSION_1_0); cur_icd.add_instance_extension({VK_KHR_SURFACE_EXTENSION_NAME}); cur_icd.add_instance_extension({VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME}); cur_icd.physical_devices.emplace_back("physical_device_0"); -- 2.7.4