loader: Fix pre-instance proc addresses

Fix a bug where vkGetInstanceProcAddr would return a null pointer for
any command that does not require an instance if an instance was
given

Change-Id: Iec5766f9c37104c36852f758d391a9b0b54ec0ec

1 files changed, 1 insertions, 6 deletions

diff --git a/loader/trampoline.c b/loader/trampoline.c
index 367d3f18..da6f0ac9 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -46,13 +46,8 @@ LOADER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetInstanceProcAddr(VkI
     void *addr;
 
     addr = globalGetProcAddr(pName);
-    if (instance == VK_NULL_HANDLE) {
-        // Get entrypoint addresses that are global (no dispatchable object)
-
+    if (instance == VK_NULL_HANDLE || addr != NULL) {
         return addr;
-    } else {
-        // If a global entrypoint return NULL
-        if (addr) return NULL;
     }
 
     struct loader_instance *ptr_instance = loader_get_instance(instance);