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

[GitLab Mirror]

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

Author: Georg Lehmann <dadschoorse at gmail.com>
Date:   Thu Dec 31 16:18:49 2020 +0100

vulkan/overlay: 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>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8285>
(cherry picked from commit fff77e4b434a4989e6c54ab7ef8d1aa22fe81b3a)

---

 .pick_status.json                    | 2 +-
 src/vulkan/overlay-layer/overlay.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index dea21bea3f2..73986f3c0cc 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -49,7 +49,7 @@
         "description": "vulkan/overlay: fix vkGetInstanceProcAddr self-resolving",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/vulkan/overlay-layer/overlay.cpp b/src/vulkan/overlay-layer/overlay.cpp
index c3a86a68ca7..3365580fce4 100644
--- a/src/vulkan/overlay-layer/overlay.cpp
+++ b/src/vulkan/overlay-layer/overlay.cpp
@@ -2582,6 +2582,7 @@ static const struct {
    const char *name;
    void *ptr;
 } name_to_funcptr_map[] = {
+   { "vkGetInstanceProcAddr", (void *) vkGetInstanceProcAddr },
    { "vkGetDeviceProcAddr", (void *) vkGetDeviceProcAddr },
 #define ADD_HOOK(fn) { "vk" # fn, (void *) overlay_ ## fn }
 #define ADD_ALIAS_HOOK(alias, fn) { "vk" # alias, (void *) overlay_ ## fn }