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

Commit 35b530cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Vulkan: Work-around Android start-up race condition" am: 9d98433a am:... 

Merge "Vulkan: Work-around Android start-up race condition" am: 9d98433a am: 985bb9b8 am: a4154371

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1902215

Change-Id: I25e2cece1dc7a1b8875c6c4796ee94117243f1b3
parents d9213ec4 a4154371

vulkan/libvulkan/api.cpp

+7 −0
Original line number Diff line number Diff line
@@ -965,6 +965,13 @@ VkResult LayerChain::ValidateExtensions(VkPhysicalDevice physical_dev, 
    VkResult result = EnumerateDeviceExtensionProperties(physical_dev, nullptr,

                                                         &count, nullptr);

    if (result == VK_SUCCESS && count) {

        // Work-around a race condition during Android start-up, that can result

        // in the second call to EnumerateDeviceExtensionProperties having

        // another extension.  That causes the second call to return

        // VK_INCOMPLETE.  A work-around is to add 1 to "count" and ask for one

        // more extension property.  See: http://anglebug.com/6715 and

        // internal-to-Google b/206733351.

        count++;

        driver_extensions_ = AllocateDriverExtensionArray(count);

        result = (driver_extensions_)

                     ? EnumerateDeviceExtensionProperties(