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

Commit 5e0351be authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "swapchain: Fix MAILBOX and SHARED presentation modes" am: d8fab5e8... 

Merge "swapchain: Fix MAILBOX and SHARED presentation modes" am: d8fab5e8 am: 6ef53252 am: edd7b142

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

Change-Id: I0315470c5c7e6da47f568dc9964df1495b214a8b
parents 03f9e74d edd7b142

vulkan/libvulkan/swapchain.cpp

+21 −35
Original line number Diff line number Diff line
@@ -537,30 +537,6 @@ android_dataspace GetNativeDataspace(VkColorSpaceKHR colorspace) { 
    }

}



int get_min_buffer_count(ANativeWindow* window,

                         uint32_t* out_min_buffer_count) {

    constexpr int kExtraBuffers = 2;



    int err;

    int min_undequeued_buffers;

    err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

                        &min_undequeued_buffers);

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

        ALOGE(

            "NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS query failed: %s (%d) "

            "value=%d",

            strerror(-err), err, min_undequeued_buffers);

        if (err == android::OK) {

            err = android::UNKNOWN_ERROR;

        }

        return err;

    }



    *out_min_buffer_count =

        static_cast<uint32_t>(min_undequeued_buffers + kExtraBuffers);

    return android::OK;

}



}  // anonymous namespace



VKAPI_ATTR
@@ -675,7 +651,7 @@ VkResult GetPhysicalDeviceSurfaceCapabilitiesKHR( 
              strerror(-err), err);

        return VK_ERROR_SURFACE_LOST_KHR;

    }

    capabilities->minImageCount = max_buffer_count == 1 ? 1 : 2;

    capabilities->minImageCount = std::min(max_buffer_count, 3);

    capabilities->maxImageCount = static_cast<uint32_t>(max_buffer_count);



    capabilities->currentExtent =
@@ -872,13 +848,18 @@ VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice pdev, 


    int err;

    int query_value;

    uint32_t min_buffer_count;

    ANativeWindow* window = SurfaceFromHandle(surface)->window.get();



    err = get_min_buffer_count(window, &min_buffer_count);

    if (err != android::OK) {

    err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

                        &query_value);

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

        ALOGE(

            "NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS query failed: %s (%d) "

            "value=%d",

            strerror(-err), err, query_value);

        return VK_ERROR_SURFACE_LOST_KHR;

    }

    uint32_t min_undequeued_buffers = static_cast<uint32_t>(query_value);



    err = window->query(window, NATIVE_WINDOW_MAX_BUFFER_COUNT, &query_value);

    if (err != android::OK || query_value < 0) {
@@ -889,7 +870,7 @@ VkResult GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice pdev, 
    uint32_t max_buffer_count = static_cast<uint32_t>(query_value);



    std::vector<VkPresentModeKHR> present_modes;

    if (min_buffer_count < max_buffer_count)

    if (min_undequeued_buffers + 1 < max_buffer_count)

        present_modes.push_back(VK_PRESENT_MODE_MAILBOX_KHR);

    present_modes.push_back(VK_PRESENT_MODE_FIFO_KHR);
@@ -1210,14 +1191,19 @@ VkResult CreateSwapchainKHR(VkDevice device, 
        }

    }



    uint32_t min_buffer_count;

    err = get_min_buffer_count(window, &min_buffer_count);

    if (err != android::OK) {

    int query_value;

    err = window->query(window, NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,

                        &query_value);

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

        ALOGE("window->query failed: %s (%d) value=%d", strerror(-err), err,

              query_value);

        return VK_ERROR_SURFACE_LOST_KHR;

    }



    uint32_t num_images =

        std::max(min_buffer_count, create_info->minImageCount);

    uint32_t min_undequeued_buffers = static_cast<uint32_t>(query_value);

    const auto mailbox_num_images = std::max(3u, create_info->minImageCount);

    const auto requested_images =

        swap_interval ? create_info->minImageCount : mailbox_num_images;

    uint32_t num_images = requested_images - 1 + min_undequeued_buffers;



    // Lower layer insists that we have at least two buffers. This is wasteful

    // and we'd like to relax it in the shared case, but not all the pieces are