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

Commit fabd2f5c 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:... 

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

Change-Id: I2059141c1df064ce91eb1cd651837f9445b5efb2
parents 0c0da381 bb240b98

vulkan/nulldrv/null_driver.cpp

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

                                  uint32_t* physical_device_count,

                                  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_device_count = 1;

    }

    return VK_SUCCESS;

}