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

Commit bb240b98 authored by Ian Elliott's avatar Ian Elliott Committed by android-build-merger
Browse files

Merge "Fix Vulkan null_driver's EnumeratePhysicalDevices()" am: 3a0c6aa2 am: 6fb31e8e 

am: e6874d21

Change-Id: I145de0963df0c199aa9ac249b403624c1a88af6e
parents 886d5976 e6874d21

vulkan/nulldrv/null_driver.cpp

+7 −2
Original line number Original line Diff line number Diff line
@@ -343,9 +343,14 @@ void DestroyInstance(VkInstance instance, 
VkResult EnumeratePhysicalDevices(VkInstance instance,

VkResult EnumeratePhysicalDevices(VkInstance instance,

                                  uint32_t* physical_device_count,

                                  uint32_t* physical_device_count,

                                  VkPhysicalDevice* physical_devices) {

                                  VkPhysicalDevice* physical_devices) {

    if (physical_devices && *physical_device_count >= 1)

    if (!physical_devices)

        *physical_device_count = 1;

    else if (*physical_device_count == 0)

        return VK_INCOMPLETE;

    else {

        physical_devices[0] = &instance->physical_device;

        physical_devices[0] = &instance->physical_device;

        *physical_device_count = 1;

        *physical_device_count = 1;

    }

    return VK_SUCCESS;

    return VK_SUCCESS;

}

}