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

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 67de6356f8474fa11bb8c64e835f30a910a32b1f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=67de6356f8474fa11bb8c64e835f30a910a32b1f

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>

---

 src/vulkan/device-select-layer/device_select_layer.c | 2 ++
 1 file changed, 2 insertions(+)

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)