openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_vulkan-loader.git synced 2026-07-19 17:13:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Modify loader VK_ADD_DRIVER_FILES behavior

Browse Source 
Modify the loader to only use VK_ADD_DRIVER_FILES if
VK_DRIVER_FILES or VK_ICD_FILENAMES is not used.
This could have caused weird issues with systems where VK_DRIVER_FILES
was used to force drivers in a specific order/location for testing.

Resolves issue #871
This commit is contained in:
Mark Young
2022-03-09 14:25:32 -07:00
parent 71f81bd9b0
commit 7bb8735100
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/LoaderDriverInterface.md
+3
View File
@@ -125,6 +125,9 @@ Driver Manifest files, containing the full path to the driver JSON Manifest file
This list is colon-separated on Linux and macOS, and semicolon-separated on
Windows.
It will be added prior to the standard driver search files.
If `VK_DRIVER_FILES` or `VK_ICD_FILENAMES` is present, then
`VK_ADD_DRIVER_FILES` will not be used by the loader and any values will be
ignored.
#### Exception for Elevated Privileges
docs/LoaderLayerInterface.md
+3
View File
@@ -237,6 +237,9 @@ provided by the explicit layer registry keys.
The paths provided by `VK_ADD_LAYER_PATH` are added before the standard list
of search folders and will therefore be searched first.
If `VK_LAYER_PATH` is present, then `VK_ADD_LAYER_PATH` will not be used by the
loader and any values will be ignored.
For security reasons, both `VK_LAYER_PATH` and `VK_ADD_LAYER_PATH` are ignored
if running with elevated privileges.
See [Exception for Elevated Privileges](#exception-for-elevated-privileges)
loader/loader.c
-22
View File
@@ -3002,7 +3002,6 @@ static VkResult read_data_files_in_search_paths(const struct loader_instance *in
override_env = loader_secure_getenv(VK_ICD_FILENAMES_ENV_VAR, inst);
}
additional_env = loader_secure_getenv(VK_ADDITIONAL_DRIVER_FILES_ENV_VAR, inst);
additional_env = loader_secure_getenv(VK_ADDITIONAL_DRIVER_FILES_ENV_VAR, inst);
relative_location = VK_DRIVERS_INFO_RELATIVE_DIR;
break;
case LOADER_DATA_FILE_MANIFEST_IMPLICIT_LAYER:
@@ -3031,15 +3030,6 @@ static VkResult read_data_files_in_search_paths(const struct loader_instance *in
if (NULL != override_path) {
// Local folder and null terminator
search_path_size += strlen(override_path) + 2;
// Add the size of any additional search paths defined in the additive environment variable
if (NULL != additional_env) {
search_path_size += determine_data_file_path_size(additional_env, 0) + 2;
}
} else if (NULL == relative_location) {
// If there's no override, and no relative location, bail out. This is usually
// the case when we're on Windows and the default path is to use the registry.
goto out;
} else {
// Add the size of any additional search paths defined in the additive environment variable
if (NULL != additional_env) {
@@ -3091,18 +3081,6 @@ static VkResult read_data_files_in_search_paths(const struct loader_instance *in
if (NULL != override_path) {
strcpy(cur_path_ptr, override_path);
cur_path_ptr += strlen(override_path);
if (NULL != additional_env) {
*cur_path_ptr++ = PATH_SEPARATOR;
copy_data_file_info(additional_env, NULL, 0, &cur_path_ptr);
// Remove the last path separator
*cur_path_ptr = '\0';
if (search_path[strlen(search_path) - 1] == ':') {
--cur_path_ptr;
*cur_path_ptr = '\0';
}
}
} else {
// Add any additional search paths defined in the additive environment variable
if (NULL != additional_env) {