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

Commit 8ba6e214 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter Committed by android-build-merger
Browse files

Merge "loader: cache top-of-chain PhysicalDevice" into nyc-dev 

am: 8daa5e77

* commit '8daa5e77':
  loader: cache top-of-chain PhysicalDevice
parents f694d564 8daa5e77

vulkan/libvulkan/loader.cpp

+20 −5
Original line number Original line Diff line number Diff line
@@ -265,6 +265,7 @@ struct Instance { 




    const VkAllocationCallbacks* alloc;

    const VkAllocationCallbacks* alloc;

    uint32_t num_physical_devices;

    uint32_t num_physical_devices;

    VkPhysicalDevice physical_devices_top[kMaxPhysicalDevices];

    VkPhysicalDevice physical_devices[kMaxPhysicalDevices];

    VkPhysicalDevice physical_devices[kMaxPhysicalDevices];

    DeviceExtensionSet physical_device_driver_extensions[kMaxPhysicalDevices];

    DeviceExtensionSet physical_device_driver_extensions[kMaxPhysicalDevices];
@@ -1086,7 +1087,7 @@ VkResult EnumerateDeviceExtensionProperties_Top( 
        ALOGV("  no layer");

        ALOGV("  no layer");

        Instance& instance = GetDispatchParent(gpu);

        Instance& instance = GetDispatchParent(gpu);

        size_t gpu_idx = 0;

        size_t gpu_idx = 0;

        while (instance.physical_devices[gpu_idx] != gpu)

        while (instance.physical_devices_top[gpu_idx] != gpu)

            gpu_idx++;

            gpu_idx++;

        const DeviceExtensionSet driver_extensions =

        const DeviceExtensionSet driver_extensions =

            instance.physical_device_driver_extensions[gpu_idx];

            instance.physical_device_driver_extensions[gpu_idx];
@@ -1253,6 +1254,24 @@ VkResult CreateInstance_Top(const VkInstanceCreateInfo* create_info, 
        DestroyInstance(instance, allocator);

        DestroyInstance(instance, allocator);

        return VK_ERROR_INITIALIZATION_FAILED;

        return VK_ERROR_INITIALIZATION_FAILED;

    }

    }



    // Capture the physical devices from the top of the

    // chain in case it has been wrapped by a layer.

    uint32_t num_physical_devices = 0;

    result = instance_dispatch.EnumeratePhysicalDevices(

        local_instance, &num_physical_devices, nullptr);

    if (result != VK_SUCCESS) {

        DestroyInstance(instance, allocator);

        return VK_ERROR_INITIALIZATION_FAILED;

    }

    num_physical_devices = std::min(num_physical_devices, kMaxPhysicalDevices);

    result = instance_dispatch.EnumeratePhysicalDevices(

        local_instance, &num_physical_devices,

        instance->physical_devices_top);

    if (result != VK_SUCCESS) {

        DestroyInstance(instance, allocator);

        return VK_ERROR_INITIALIZATION_FAILED;

    }

    *instance_out = local_instance;

    *instance_out = local_instance;





    if (enable_callback) {

    if (enable_callback) {
@@ -1342,10 +1361,6 @@ VkResult CreateDevice_Top(VkPhysicalDevice gpu, 
        return result;

        return result;

    }

    }





    size_t gpu_idx = 0;

    while (instance.physical_devices[gpu_idx] != gpu)

        gpu_idx++;



    uint32_t activated_layers = 0;

    uint32_t activated_layers = 0;

    VkLayerDeviceCreateInfo chain_info;

    VkLayerDeviceCreateInfo chain_info;

    VkLayerDeviceLink* layer_device_link_info = nullptr;

    VkLayerDeviceLink* layer_device_link_info = nullptr;