Merge "vulkan: Fix EnumeratePhysicalDeviceGroups()"

        result = EnumeratePhysicalDevices(instance, &device_count, nullptr);

        result = EnumeratePhysicalDevices(instance, &device_count, nullptr);

        if (result < 0)

        if (result < 0)

            return result;

            return result;

        if (!pPhysicalDeviceGroupProperties) {

        if (!pPhysicalDeviceGroupProperties) {

            *pPhysicalDeviceGroupCount = device_count;

            *pPhysicalDeviceGroupCount = device_count;

            return result;

            return result;

        }

        }

        device_count = std::min(device_count, *pPhysicalDeviceGroupCount);

        if (!device_count) {

        if (!device_count) {

            *pPhysicalDeviceGroupCount = 0;

            *pPhysicalDeviceGroupCount = 0;

            return result;

            return result;

        }

        }

        device_count = std::min(device_count, *pPhysicalDeviceGroupCount);

        if (!device_count)

            return VK_INCOMPLETE;

        android::Vector<VkPhysicalDevice> devices;

        android::Vector<VkPhysicalDevice> devices;

        devices.resize(device_count);

        devices.resize(device_count);

        *pPhysicalDeviceGroupCount = device_count;

        result = EnumeratePhysicalDevices(instance, &device_count,

        result = EnumeratePhysicalDevices(instance, &device_count,

                                          devices.editArray());

                                          devices.editArray());

        if (result < 0)

        if (result < 0)

            return result;

            return result;

        devices.resize(device_count);

        *pPhysicalDeviceGroupCount = device_count;

        for (uint32_t i = 0; i < device_count; ++i) {

        for (uint32_t i = 0; i < device_count; ++i) {

            pPhysicalDeviceGroupProperties[i].physicalDeviceCount = 1;

            pPhysicalDeviceGroupProperties[i].physicalDeviceCount = 1;

            pPhysicalDeviceGroupProperties[i].physicalDevices[0] = devices[i];

            pPhysicalDeviceGroupProperties[i].physicalDevices[0] = devices[i];