Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a637a84 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter Committed by android-build-merger
Browse files

Merge "loader: Include instance where required for GIPA" into nyc-dev 

am: e177d061

* commit 'e177d061':
  loader: Include instance where required for GIPA
parents 9a15cb76 e177d061

vulkan/libvulkan/loader.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -1244,7 +1244,7 @@ VkResult CreateInstance_Top(const VkInstanceCreateInfo* create_info, 
        ALOGV("Failed to initialize instance dispatch table");

        ALOGV("Failed to initialize instance dispatch table");

        PFN_vkDestroyInstance destroy_instance =

        PFN_vkDestroyInstance destroy_instance =

            reinterpret_cast<PFN_vkDestroyInstance>(

            reinterpret_cast<PFN_vkDestroyInstance>(

                next_gipa(VK_NULL_HANDLE, "vkDestroyInstance"));

                next_gipa(local_instance, "vkDestroyInstance"));

        if (!destroy_instance) {

        if (!destroy_instance) {

            ALOGD("Loader unable to find DestroyInstance");

            ALOGD("Loader unable to find DestroyInstance");

            return VK_ERROR_INITIALIZATION_FAILED;

            return VK_ERROR_INITIALIZATION_FAILED;
@@ -1392,7 +1392,7 @@ VkResult CreateDevice_Top(VkPhysicalDevice gpu, 
    }

    }





    PFN_vkCreateDevice create_device = reinterpret_cast<PFN_vkCreateDevice>(

    PFN_vkCreateDevice create_device = reinterpret_cast<PFN_vkCreateDevice>(

        next_gipa(VK_NULL_HANDLE, "vkCreateDevice"));

        next_gipa(instance.handle, "vkCreateDevice"));

    if (!create_device) {

    if (!create_device) {

        ALOGE("Unable to find vkCreateDevice for driver");

        ALOGE("Unable to find vkCreateDevice for driver");

        DestroyDevice(device);

        DestroyDevice(device);
@@ -1440,7 +1440,7 @@ VkResult CreateDevice_Top(VkPhysicalDevice gpu, 
        ALOGV("Failed to initialize device dispatch table");

        ALOGV("Failed to initialize device dispatch table");

        PFN_vkDestroyDevice destroy_device =

        PFN_vkDestroyDevice destroy_device =

            reinterpret_cast<PFN_vkDestroyDevice>(

            reinterpret_cast<PFN_vkDestroyDevice>(

                next_gipa(VK_NULL_HANDLE, "vkDestroyDevice"));

                next_gipa(instance.handle, "vkDestroyDevice"));

        ALOG_ASSERT(destroy_device != nullptr,

        ALOG_ASSERT(destroy_device != nullptr,

                    "Loader unable to find DestroyDevice");

                    "Loader unable to find DestroyDevice");

        destroy_device(local_device, allocator);

        destroy_device(local_device, allocator);