Mesa (staging/20.3): vulkan/device-select: fix vkGetInstanceProcAddr self-resolving

[GitLab Mirror]

Module: Mesa
Branch: staging/20.3
Commit: 945bffe00878130f1b814d5d1a97fea8bc117a8a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=945bffe00878130f1b814d5d1a97fea8bc117a8a

Author: Georg Lehmann <dadschoorse at gmail.com>
Date:   Thu Dec 31 17:17:34 2020 +0100

vulkan/device-select: fix vkGetInstanceProcAddr self-resolving

vkGetInstanceProcAddr(instance, "vkGetInstanceProcAddr") should return our
vkGetInstanceProcAddr not the next in the chain.

CC: mesa-stable
Signed-off-by: Georg Lehmann <dadschoorse at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8286>
(cherry picked from commit 67de6356f8474fa11bb8c64e835f30a910a32b1f)

---

 .pick_status.json                                    | 2 +-
 src/vulkan/device-select-layer/device_select_layer.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1b347bd2041..878f5f5b4f9 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -796,7 +796,7 @@
         "description": "vulkan/device-select: fix vkGetInstanceProcAddr self-resolving",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/device-select-layer/device_select_layer.c b/src/vulkan/device-select-layer/device_select_layer.c
index 5b708bcd58b..c381ac33fd1 100644
--- a/src/vulkan/device-select-layer/device_select_layer.c
+++ b/src/vulkan/device-select-layer/device_select_layer.c
@@ -490,6 +490,8 @@ static void  (*get_pdevice_proc_addr(VkInstance instance, const char* name))()
 
 static void  (*get_instance_proc_addr(VkInstance instance, const char* name))()
 {
+   if (strcmp(name, "vkGetInstanceProcAddr") == 0)
+      return (void(*)())get_instance_proc_addr;
    if (strcmp(name, "vkCreateInstance") == 0)
       return (void(*)())device_select_CreateInstance;
    if (strcmp(name, "vkDestroyInstance") == 0)