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

Commit 1528f5da authored by Trevor David Black's avatar Trevor David Black Committed by Android Build Coastguard Worker
Browse files

bound the swapchain num_image by the min and max image count 

Bug: 313353712
Bug: 316517849
Bug: 296019634
Test: atest CtsDeqpTestCases -- --module-arg 'CtsDeqpTestCases:include-filter:dEQP-VK.wsi.*'
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:abab5a09b414afb9e9d21dfeb8a10c7ccb337d8c)
Merged-In: I0726b39aacaba87a531af9bef23c8a214bc38425
Change-Id: I0726b39aacaba87a531af9bef23c8a214bc38425
parent f70c68cb

vulkan/libvulkan/swapchain.cpp

+29 −6
Original line number Original line Diff line number Diff line
@@ -1762,6 +1762,8 @@ VkResult CreateSwapchainKHR(VkDevice device, 
    }

    }





    int query_value;

    int query_value;

    // TODO: Now that we are calling into GPDSC2 directly, this query may be redundant

    //       the call to std::max(min_buffer_count, num_images) may be redundant as well

    err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

    err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

                        &query_value);

                        &query_value);

    if (err != android::OK || query_value < 0) {

    if (err != android::OK || query_value < 0) {
@@ -1778,12 +1780,33 @@ VkResult CreateSwapchainKHR(VkDevice device, 
    // with extra images (which they can't actually use!).

    // with extra images (which they can't actually use!).

    const uint32_t min_buffer_count = min_undequeued_buffers + 1;

    const uint32_t min_buffer_count = min_undequeued_buffers + 1;





    uint32_t num_images;

    // Call into GPDSC2 to get the minimum and maximum allowable buffer count for the surface of

    if (create_info->presentMode  == VK_PRESENT_MODE_MAILBOX_KHR) {

    // interest. This step is only necessary if the app requests a number of images

        num_images = std::max(3u, create_info->minImageCount);

    // (create_info->minImageCount) that is less or more than the surface capabilities.

    } else {

    // An app should be calling GPDSC2 and using those values to set create_info, but in the

        num_images = create_info->minImageCount;

    // event that the app has hard-coded image counts an error can occur

    }

    VkSurfacePresentModeEXT present_mode = {

        VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT,

        nullptr,

        create_info->presentMode

    };

    VkPhysicalDeviceSurfaceInfo2KHR surface_info2 = {

        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR,

        &present_mode,

        create_info->surface

    };

    VkSurfaceCapabilities2KHR surface_capabilities2 = {

        VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR,

        nullptr,

        {},

    };

    result = GetPhysicalDeviceSurfaceCapabilities2KHR(GetData(device).driver_physical_device,

            &surface_info2, &surface_capabilities2);



    uint32_t num_images = create_info->minImageCount;

    num_images = std::clamp(num_images,

            surface_capabilities2.surfaceCapabilities.minImageCount,

            surface_capabilities2.surfaceCapabilities.maxImageCount);





    const uint32_t buffer_count = std::max(min_buffer_count, num_images);

    const uint32_t buffer_count = std::max(min_buffer_count, num_images);

    err = native_window_set_buffer_count(window, buffer_count);

    err = native_window_set_buffer_count(window, buffer_count);