From afc1bc9f698e3d8bd245c6fc240d07b4b6b4a38a Mon Sep 17 00:00:00 2001 From: Jozsef Hapak Date: Mon, 10 Nov 2025 19:19:47 +0100 Subject: [PATCH] loader: Use VULKAN_DIR macro in pathes Also introduce TESTING_VULKAN_DIR macro in test framework --- loader/settings.c | 80 ++++------------------------- tests/framework/util/test_defines.h | 6 +++ tests/loader_settings_tests.cpp | 12 +---- 3 files changed, 19 insertions(+), 79 deletions(-) diff --git a/loader/settings.c b/loader/settings.c index d8ebe27c9..3ca695217 100644 --- a/loader/settings.c +++ b/loader/settings.c @@ -487,14 +487,13 @@ VkResult get_unix_settings_path(const struct loader_instance* inst, char** setti } #endif -#ifdef VULKANSC - VkResult res = check_if_settings_path_exists(inst, xdg_config_home, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); + VkResult res = check_if_settings_path_exists( + inst, xdg_config_home, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } - res = check_if_settings_path_exists(inst, xdg_data_home, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, + res = check_if_settings_path_exists(inst, xdg_data_home, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; @@ -504,102 +503,45 @@ VkResult get_unix_settings_path(const struct loader_instance* inst, char** setti char* home = loader_secure_getenv("HOME", inst); if (home != NULL) { if (NULL == xdg_config_home || '\0' == xdg_config_home[0]) { - res = check_if_settings_path_exists(inst, home, "/.config/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); + res = check_if_settings_path_exists( + inst, home, "/.config/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } } if (NULL == xdg_data_home || '\0' == xdg_data_home[0]) { - res = check_if_settings_path_exists(inst, home, "/.local/share/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); + res = check_if_settings_path_exists( + inst, home, "/.local/share/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } } } - res = check_if_settings_path_exists(inst, xdg_config_dirs, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, + res = check_if_settings_path_exists(inst, xdg_config_dirs, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } - res = check_if_settings_path_exists(inst, SYSCONFDIR, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, + res = check_if_settings_path_exists(inst, SYSCONFDIR, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } #if defined(EXTRASYSCONFDIR) - res = check_if_settings_path_exists(inst, EXTRASYSCONFDIR, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, + res = check_if_settings_path_exists(inst, EXTRASYSCONFDIR, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } #endif - res = check_if_settings_path_exists(inst, xdg_data_dirs, "/vulkansc/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, + res = check_if_settings_path_exists(inst, xdg_data_dirs, "/" VULKAN_DIR "/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, settings_file_path); if (res == VK_SUCCESS) { return res; } -#else // VULKANSC - VkResult res = check_if_settings_path_exists(inst, xdg_config_home, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } - - res = check_if_settings_path_exists(inst, xdg_data_home, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } - - // Check home if either xdg_config_home or xdg_data_home wasn't set - char* home = loader_secure_getenv("HOME", inst); - if (home != NULL) { - if (NULL == xdg_config_home || '\0' == xdg_config_home[0]) { - res = check_if_settings_path_exists(inst, home, "/.config/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } - } - if (NULL == xdg_data_home || '\0' == xdg_data_home[0]) { - res = check_if_settings_path_exists(inst, home, "/.local/share/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } - } - } - - res = check_if_settings_path_exists(inst, xdg_config_dirs, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } - - res = check_if_settings_path_exists(inst, SYSCONFDIR, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } -#if defined(EXTRASYSCONFDIR) - - res = check_if_settings_path_exists(inst, EXTRASYSCONFDIR, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } -#endif - res = check_if_settings_path_exists(inst, xdg_data_dirs, "/vulkan/loader_settings.d/" VK_LOADER_SETTINGS_FILENAME, - settings_file_path); - if (res == VK_SUCCESS) { - return res; - } -#endif return VK_ERROR_INITIALIZATION_FAILED; } diff --git a/tests/framework/util/test_defines.h b/tests/framework/util/test_defines.h index 63d6a32e9..4afd22303 100644 --- a/tests/framework/util/test_defines.h +++ b/tests/framework/util/test_defines.h @@ -44,6 +44,12 @@ #define TESTING_COMMON_UNIX_PLATFORMS 0 #endif +#ifdef VULKANSC +#define TESTING_VULKAN_DIR "vulkansc/" +#else +#define TESTING_VULKAN_DIR "vulkan/" +#endif // VULKANSC + #include FRAMEWORK_CONFIG_HEADER enum class ManifestCategory { implicit_layer, explicit_layer, icd, settings }; diff --git a/tests/loader_settings_tests.cpp b/tests/loader_settings_tests.cpp index 7f8019404..09e819863 100644 --- a/tests/loader_settings_tests.cpp +++ b/tests/loader_settings_tests.cpp @@ -40,11 +40,7 @@ std::string get_settings_location_log_message([[maybe_unused]] FrameworkEnvironm return s + (env.get_folder(settings_location).location() / "vk_loader_settings.json").string(); #elif TESTING_COMMON_UNIX_PLATFORMS return s + (use_secure ? env.secure_manifest_base_location : env.unsecure_manifest_base_location) + -#ifdef VULKANSC - "/vulkansc/loader_settings.d/vk_loader_settings.json"; -#else - "/vulkan/loader_settings.d/vk_loader_settings.json"; -#endif + "/" TESTING_VULKAN_DIR "/loader_settings.d/vk_loader_settings.json"; #endif } std::string get_unsecure_settings_location_log_message(FrameworkEnvironment const& env) { @@ -58,11 +54,7 @@ std::string get_settings_not_in_use_log_message([[maybe_unused]] FrameworkEnviro return s + (env.get_folder(settings_location).location() / "vk_loader_settings.json").string(); #elif TESTING_COMMON_UNIX_PLATFORMS return s + (use_secure ? env.secure_manifest_base_location : env.unsecure_manifest_base_location) + -#ifdef VULKANSC - "/vulkansc/loader_settings.d/vk_loader_settings.json\" but did not contain any valid settings."; -#else - "/vulkan/loader_settings.d/vk_loader_settings.json\" but did not contain any valid settings."; -#endif + "/" TESTING_VULKAN_DIR "/loader_settings.d/vk_loader_settings.json\" but did not contain any valid settings."; #endif } enum class LayerType {