From 4fe2d928aff6bd721cfb576ca1a39f678dba3bcd Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Thu, 10 Mar 2016 13:28:52 -0700 Subject: loader: Include instance where required for GIPA Bug: 27579008 GetInstanceProcAddr is only speced to allow VK_NULL_HANDLE for the instance for a few calls. Change-Id: If350e23edc336bff3b499631ba9a68b2921c6969 --- vulkan/libvulkan/loader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vulkan/libvulkan/loader.cpp') diff --git a/vulkan/libvulkan/loader.cpp b/vulkan/libvulkan/loader.cpp index df088b3c00..07044a3d21 100644 --- a/vulkan/libvulkan/loader.cpp +++ b/vulkan/libvulkan/loader.cpp @@ -1182,7 +1182,7 @@ VkResult CreateInstance_Top(const VkInstanceCreateInfo* create_info, ALOGV("Failed to initialize instance dispatch table"); PFN_vkDestroyInstance destroy_instance = reinterpret_cast( - next_gipa(VK_NULL_HANDLE, "vkDestroyInstance")); + next_gipa(local_instance, "vkDestroyInstance")); if (!destroy_instance) { ALOGD("Loader unable to find DestroyInstance"); return VK_ERROR_INITIALIZATION_FAILED; @@ -1330,7 +1330,7 @@ VkResult CreateDevice_Top(VkPhysicalDevice gpu, } PFN_vkCreateDevice create_device = reinterpret_cast( - next_gipa(VK_NULL_HANDLE, "vkCreateDevice")); + next_gipa(instance.handle, "vkCreateDevice")); if (!create_device) { ALOGE("Unable to find vkCreateDevice for driver"); DestroyDevice(device); @@ -1367,7 +1367,7 @@ VkResult CreateDevice_Top(VkPhysicalDevice gpu, ALOGV("Failed to initialize device dispatch table"); PFN_vkDestroyDevice destroy_device = reinterpret_cast( - next_gipa(VK_NULL_HANDLE, "vkDestroyDevice")); + next_gipa(instance.handle, "vkDestroyDevice")); ALOG_ASSERT(destroy_device != nullptr, "Loader unable to find DestroyDevice"); destroy_device(local_device, allocator); -- cgit v1.2.3-59-g8ed1b