openharmony/third_party_vulkan-loader
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_vulkan-loader synced 2024-11-23 23:29:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Output message if override app_keys mismatch on app name

Browse Source 
Output a layer message if the override layer is present and the
app name is not in the app_keys list.
Fixes issue #917.
This commit is contained in:
Mark Young 2022-05-05 10:01:39 -06:00 committed by Charles Giessen
parent 956139e991
commit 08cad0c015
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
loader/loader.c
View File

@ -1870,8 +1870,8 @@ static void remove_all_non_valid_override_layers(struct loader_instance *inst, s
found_active_override_layer = true;
} else {
loader_log(
inst, VULKAN_LOADER_WARN_BIT, 0,
"remove_all_non_valid_override_layers: Multiple override layers where the samepath in app_keys "
inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0,
"remove_all_non_valid_override_layers: Multiple override layers where the same path in app_keys "
"was found. Using the first layer found");
// Remove duplicate active override layers that have the same app_key_path
@ -1881,6 +1881,11 @@ static void remove_all_non_valid_override_layers(struct loader_instance *inst, s
}
}
if (!found_active_override_layer) {
loader_log(
inst, VULKAN_LOADER_INFO_BIT | VULKAN_LOADER_LAYER_BIT, 0,
"--Override layer found but not used because app \'%s\' is not in \'app_keys\' list!",
cur_path);
// Remove non-global override layers that don't have an app_key that matches cur_path
loader_remove_layer_in_list(inst, instance_layers, i);
i--;
@ -1890,7 +1895,7 @@ static void remove_all_non_valid_override_layers(struct loader_instance *inst, s
global_layer_index = i;
} else {
loader_log(
inst, VULKAN_LOADER_WARN_BIT, 0,
inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0,
"remove_all_non_valid_override_layers: Multiple global override layers found. Using the first global "
"layer found");
loader_remove_layer_in_list(inst, instance_layers, i);
@ -2500,7 +2505,7 @@ static VkResult loader_read_layer_json(const struct loader_instance *inst, struc
app_keys = cJSON_GetObjectItem(layer_node, "app_keys");
if (app_keys != NULL) {
if (strcmp(name, VK_OVERRIDE_LAYER_NAME)) {
loader_log(inst, VULKAN_LOADER_WARN_BIT, 0,
loader_log(inst, VULKAN_LOADER_WARN_BIT | VULKAN_LOADER_LAYER_BIT, 0,
"Layer %s contains app_keys, but any app_keys can only be provided by the override metalayer. "
"These will be ignored.",
name);