commit 6bed0c5227c4babd6d6f07b6842e1480cfd05078
author Ian Elliott <ianelliott@google.com> Thu Nov 02 10:13:27 2017 -0600
committer Jesse Hall <jessehall@google.com> Wed Apr 04 22:22:32 2018 -0700
tree fd6bc8f78a86c9e1d1afcf446ff987c6bec787a5
parent 1d990b21fe66c5ff4af3be3d4434807ab1a0efab

Properly implement stubhal's vkGetInstanceProcAddr()

It used to always return a crashing-NoOp function for unknown functions.  Now,
it attempt to follow the spec and return either NULL or a non-crashing-NoOp
function where appropriate.

Test: VulkanFeaturesTest
Bug: 68779289
Change-Id: I98f9fd2a0a1bef4a985c46dbce93216488da82e7
(cherry picked from commit 53333057f31bf91765b930b12ec44e9af1bd18f2)

vulkan/libvulkan/stubhal.cpp

diff --git a/vulkan/libvulkan/stubhal.cpp b/vulkan/libvulkan/stubhal.cpp
index 2926268..726e854 100644
--- a/vulkan/libvulkan/stubhal.cpp
+++ b/vulkan/libvulkan/stubhal.cpp
@@ -97,7 +97,7 @@
     return VK_SUCCESS;
 }
 
-VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance /*instance*/,
+VKAPI_ATTR PFN_vkVoidFunction GetInstanceProcAddr(VkInstance instance,
                                                   const char* name) {
     if (strcmp(name, "vkCreateInstance") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(CreateInstance);
@@ -110,7 +110,9 @@
         return reinterpret_cast<PFN_vkVoidFunction>(EnumeratePhysicalDevices);
     if (strcmp(name, "vkGetInstanceProcAddr") == 0)
         return reinterpret_cast<PFN_vkVoidFunction>(GetInstanceProcAddr);
-
+    // Per the spec, return NULL if instance is NULL.
+    if (!instance)
+        return nullptr;
     // None of the other Vulkan functions should ever be called, as they all
     // take a VkPhysicalDevice or other object obtained from a physical device.
     return reinterpret_cast<PFN_vkVoidFunction>(NoOp);