diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-27 13:19:22 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-17 20:56:36 -0600 |
| commit | 813d8d2445d30223a6f46ccf4806f9e41754b333 (patch) | |
| tree | 02b28cd61eb4eff2cd1ed792eb61f1952828e3f5 /loader/loader.c | |
| parent | 6d1a08c9b98b20e21903f46f491016358e391c4c (diff) | |
| download | usermoji-813d8d2445d30223a6f46ccf4806f9e41754b333.tar.xz | |
loader: Fix info string of device versus instance layer being added
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/loader/loader.c b/loader/loader.c index 55e8ac67..064b3dca 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -867,7 +867,7 @@ static bool loader_layers_activated(const struct loader_icd *icd, const uint32_t } static loader_platform_dl_handle loader_add_layer_lib( - struct loader_instance *inst, + const char *chain_type, struct loader_extension_property *ext_prop) { struct loader_lib_info *new_layer_lib_list, *my_lib; @@ -882,7 +882,7 @@ static loader_platform_dl_handle loader_add_layer_lib( /* Have already loaded this library, just increment ref count */ loader.loaded_layer_lib_list[i].ref_count++; loader_log(VK_DBG_REPORT_INFO_BIT, 0, - "Inserting instance layer %s from library %s", + "Inserting %s layer %s from library %s", chain_type, ext_prop->info.name, ext_prop->lib_name); return loader.loaded_layer_lib_list[i].lib_handle; } @@ -909,7 +909,7 @@ static loader_platform_dl_handle loader_add_layer_lib( return NULL; } else { loader_log(VK_DBG_REPORT_INFO_BIT, 0, - "Inserting instance layer %s from library %s", + "Inserting %s layer %s from library %s", chain_type, ext_prop->info.name, ext_prop->lib_name); } loader.loaded_layer_lib_count++; @@ -1127,7 +1127,7 @@ uint32_t loader_activate_instance_layers(struct loader_instance *inst) char funcStr[256]; snprintf(funcStr, 256, "%sGetInstanceProcAddr", ext_prop->info.name); - lib_handle = loader_add_layer_lib(inst, ext_prop); + lib_handle = loader_add_layer_lib("instance", ext_prop); if ((nextGPA = (PFN_vkGetInstanceProcAddr) loader_platform_get_proc_address(lib_handle, funcStr)) == NULL) nextGPA = (PFN_vkGetInstanceProcAddr) loader_platform_get_proc_address(lib_handle, "vkGetInstanceProcAddr"); if (!nextGPA) { @@ -1214,7 +1214,7 @@ extern uint32_t loader_activate_device_layers( char funcStr[256]; snprintf(funcStr, 256, "%sGetDeviceProcAddr", ext_prop->info.name); - lib_handle = loader_add_layer_lib((struct loader_instance *) (icd->instance), ext_prop); + lib_handle = loader_add_layer_lib("device", ext_prop); if ((nextGPA = (PFN_vkGetDeviceProcAddr) loader_platform_get_proc_address(lib_handle, funcStr)) == NULL) nextGPA = (PFN_vkGetDeviceProcAddr) loader_platform_get_proc_address(lib_handle, "vkGetDeviceProcAddr"); if (!nextGPA) { |