From: Charles Giessen <charles@lunarg.com>
Date: Tue, 16 Jul 2024 05:40:57 +0000 (-0500)
Subject: Make layer interface deprecation notice conditional
X-Git-Tag: upstream/1.3.296~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e77a24e467d6cd3dbd949dedd057bc7c8b940a69;p=platform%2Fupstream%2FVulkan-Loader.git

Make layer interface deprecation notice conditional

The notice that renaming vkGetInstanceProcAddr and vkGetDeviceProcAddr functions in the
layer manifest is deprecated will now only be printed if the layer does not also
rename the vkNegotiateLoaderLayerInterfaceVersion function.
---

diff --git a/loader/loader.c b/loader/loader.c
index 3815ef18..715f7531 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2573,7 +2573,8 @@ VkResult loader_read_layer_json(const struct loader_instance *inst, struct loade
         result = loader_parse_json_string(functions, "vkGetInstanceProcAddr", &props.functions.str_gipa);
         if (result == VK_ERROR_OUT_OF_HOST_MEMORY) goto out;
 
-        if (props.functions.str_gipa && loader_check_version_meets_required(loader_combine_version(1, 1, 0), version)) {
+        if (NULL == props.functions.str_negotiate_interface && props.functions.str_gipa &&
+            loader_check_version_meets_required(loader_combine_version(1, 1, 0), version)) {
             loader_log(inst, VULKAN_LOADER_INFO_BIT, 0,
                        "Layer \"%s\" using deprecated \'vkGetInstanceProcAddr\' tag which was deprecated starting with JSON "
                        "file version 1.1.0. The new vkNegotiateLoaderLayerInterfaceVersion function is preferred, though for "
@@ -2584,7 +2585,8 @@ VkResult loader_read_layer_json(const struct loader_instance *inst, struct loade
         result = loader_parse_json_string(functions, "vkGetDeviceProcAddr", &props.functions.str_gdpa);
         if (result == VK_ERROR_OUT_OF_HOST_MEMORY) goto out;
 
-        if (props.functions.str_gdpa && loader_check_version_meets_required(loader_combine_version(1, 1, 0), version)) {
+        if (NULL == props.functions.str_negotiate_interface && props.functions.str_gdpa &&
+            loader_check_version_meets_required(loader_combine_version(1, 1, 0), version)) {
             loader_log(inst, VULKAN_LOADER_INFO_BIT, 0,
                        "Layer \"%s\" using deprecated \'vkGetDeviceProcAddr\' tag which was deprecated starting with JSON "
                        "file version 1.1.0. The new vkNegotiateLoaderLayerInterfaceVersion function is preferred, though for "