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

Commit ec952117 authored by Chad Versace's avatar Chad Versace Committed by android-build-merger
Browse files

Merge "vulkan: Fix EnumeratePhysicalDeviceGroups()" am: 500d2d89 am: 31fd8eb6

am: f4131f0d

Change-Id: I023841e8c61650b921b728ba41f525670cdcb5c1
parents ed86202e f4131f0d
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -1165,27 +1165,28 @@ VkResult EnumeratePhysicalDeviceGroups(
        result = EnumeratePhysicalDevices(instance, &device_count, nullptr);
        if (result < 0)
            return result;

        if (!pPhysicalDeviceGroupProperties) {
            *pPhysicalDeviceGroupCount = device_count;
            return result;
        }

        device_count = std::min(device_count, *pPhysicalDeviceGroupCount);
        if (!device_count) {
            *pPhysicalDeviceGroupCount = 0;
            return result;
        }
        device_count = std::min(device_count, *pPhysicalDeviceGroupCount);
        if (!device_count)
            return VK_INCOMPLETE;

        android::Vector<VkPhysicalDevice> devices;
        devices.resize(device_count);

        *pPhysicalDeviceGroupCount = device_count;
        result = EnumeratePhysicalDevices(instance, &device_count,
                                          devices.editArray());
        if (result < 0)
            return result;

        devices.resize(device_count);
        *pPhysicalDeviceGroupCount = device_count;
        for (uint32_t i = 0; i < device_count; ++i) {
            pPhysicalDeviceGroupProperties[i].physicalDeviceCount = 1;
            pPhysicalDeviceGroupProperties[i].physicalDevices[0] = devices[i];