From 0711584159499f75fb883f23510ea585f59a3dbe Mon Sep 17 00:00:00 2001 From: Mark Young Date: Wed, 18 Apr 2018 15:23:43 -0600 Subject: [PATCH] loader: Clarify loader warning Clarify several loader warnings about layers so that they include the name of the layer that is causing an issue. Change-Id: Ie48d73f6cc8466c3114597831fef451b3ab32bf7 --- loader/loader.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index 9908595..d5a0f45 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -2709,12 +2709,10 @@ static VkResult loader_read_json_layer(const struct loader_instance *inst, struc strncpy(props->functions.str_gipa, vkGetInstanceProcAddr, sizeof(props->functions.str_gipa)); if (version.major > 1 || version.minor >= 1) { loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, - "Indicating layer-specific vkGetInstanceProcAddr " - "function is deprecated starting with JSON file " - "version 1.1.0. Instead, use the new " - "vkNegotiateLayerInterfaceVersion function to " - "return the GetInstanceProcAddr function for this" - "layer"); + "Layer \"%s\" using deprecated \'vkGetInstanceProcAddr\' tag which was deprecated starting with JSON " + "file version 1.1.0. Instead, use the new vkNegotiateLayerInterfaceVersion function to return the " + "GetInstanceProcAddr function for this layer.", + name); } } props->functions.str_gipa[sizeof(props->functions.str_gipa) - 1] = '\0'; @@ -2722,12 +2720,10 @@ static VkResult loader_read_json_layer(const struct loader_instance *inst, struc strncpy(props->functions.str_gdpa, vkGetDeviceProcAddr, sizeof(props->functions.str_gdpa)); if (version.major > 1 || version.minor >= 1) { loader_log(inst, VK_DEBUG_REPORT_WARNING_BIT_EXT, 0, - "Indicating layer-specific vkGetDeviceProcAddr " - "function is deprecated starting with JSON file " - "version 1.1.0. Instead, use the new " - "vkNegotiateLayerInterfaceVersion function to " - "return the GetDeviceProcAddr function for this" - "layer"); + "Layer \"%s\" using deprecated \'vkGetDeviceProcAddr\' tag which was deprecated starting with JSON " + "file version 1.1.0. Instead, use the new vkNegotiateLayerInterfaceVersion function to return the " + "GetDeviceProcAddr function for this layer.", + name); } } props->functions.str_gdpa[sizeof(props->functions.str_gdpa) - 1] = '\0'; -- 2.7.4