From: Bas Nieuwenhuizen Date: Mon, 20 May 2019 01:10:46 +0000 (+0200) Subject: vulkan/wsi/x11: Wait for GPU work before present with mailbox. X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=5eae9bfbfcb3cdc8d7c82adaf99350ac30d40dce vulkan/wsi/x11: Wait for GPU work before present with mailbox. Otherwise the wait only happens at flip time, which messes with keeping idle buffers around if the GPU work makes the image miss the next flip. I decided not to use the wait fences as those are still xshm fences, so that means we'd still have to wait in the application. Just doing it before presenting makes things simpler. Reviewed-by: Lionel Landwerlin --- diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c index e233c0625f3..40bdd410605 100644 --- a/src/vulkan/wsi/wsi_common_x11.c +++ b/src/vulkan/wsi/wsi_common_x11.c @@ -1091,6 +1091,16 @@ x11_manage_fifo_queues(void *state) return NULL; } + if (chain->base.present_mode == VK_PRESENT_MODE_MAILBOX_KHR) { + result = chain->base.wsi->WaitForFences(chain->base.device, 1, + &chain->base.fences[image_index], + true, UINT64_MAX); + if (result != VK_SUCCESS) { + result = VK_ERROR_OUT_OF_DATE_KHR; + goto fail; + } + } + uint64_t target_msc = 0; if (chain->has_acquire_queue) target_msc = chain->last_present_msc + 1; @@ -1503,7 +1513,8 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface, goto fail_init_images; } - if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) { + if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR || + chain->base.present_mode == VK_PRESENT_MODE_MAILBOX_KHR) { chain->has_present_queue = true; /* Initialize our queues. We make them base.image_count + 1 because we will