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

Commit 97ef461b authored by Chris Forbes's avatar Chris Forbes
Browse files

vulkan: Set shared & auto refresh modes earlier 

We'd like to be able to remove the 2-buffer-minimum workaround -- but to
make that reasonable, we need the lower layers to know we're trying to
use shared mode. Set the appropriate modes before determining the buffer
counts, as a first step toward that.

Change-Id: I83a676fc1a86510abd4521cf9a5e80c0334d5941
Test: build
parent f883564b

vulkan/libvulkan/swapchain.cpp

+19 −20
Original line number Diff line number Diff line
@@ -930,6 +930,25 @@ VkResult CreateSwapchainKHR(VkDevice device, 
        return VK_ERROR_SURFACE_LOST_KHR;

    }



    VkSwapchainImageUsageFlagsANDROID swapchain_image_usage = 0;

    if (create_info->presentMode == VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR ||

        create_info->presentMode == VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR) {

        swapchain_image_usage |= VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_ANDROID;

        err = native_window_set_shared_buffer_mode(surface.window.get(), true);

        if (err != 0) {

            ALOGE("native_window_set_shared_buffer_mode failed: %s (%d)", strerror(-err), err);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

    }



    if (create_info->presentMode == VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR) {

        err = native_window_set_auto_refresh(surface.window.get(), true);

        if (err != 0) {

            ALOGE("native_window_set_auto_refresh failed: %s (%d)", strerror(-err), err);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

    }



    int query_value;

    err = surface.window->query(surface.window.get(),

                                NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS,
@@ -959,26 +978,6 @@ VkResult CreateSwapchainKHR(VkDevice device, 
        return VK_ERROR_SURFACE_LOST_KHR;

    }



    VkSwapchainImageUsageFlagsANDROID swapchain_image_usage = 0;

    if (create_info->presentMode == VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR ||

        create_info->presentMode == VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR) {

        swapchain_image_usage |= VK_SWAPCHAIN_IMAGE_USAGE_SHARED_BIT_ANDROID;



        err = native_window_set_shared_buffer_mode(surface.window.get(), true);

        if (err != 0) {

            ALOGE("native_window_set_shared_buffer_mode failed: %s (%d)", strerror(-err), err);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

    }



    if (create_info->presentMode == VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR) {

        err = native_window_set_auto_refresh(surface.window.get(), true);

        if (err != 0) {

            ALOGE("native_window_set_auto_refresh failed: %s (%d)", strerror(-err), err);

            return VK_ERROR_SURFACE_LOST_KHR;

        }

    }



    int gralloc_usage = 0;

    if (dispatch.GetSwapchainGrallocUsage2ANDROID) {

        uint64_t consumer_usage, producer_usage;