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

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

Merge "Fix Vulkan null_driver's EnumeratePhysicalDevices()" 

am: 3a0c6aa2

Change-Id: Ic85e905db2cb5649992e20ca341b50f641f3d687
parents 016e9504 3a0c6aa2

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;

}

}