fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 11:00:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi: Add basic support for PresentWait2

Browse source 
Add common code for PresentWait2.

Unlike PresentWait, PresentWait2 is exposed by a surface capability.

On Wayland, PresentWait (and PresentWait2) require the presentation-time
extension to be available for a proper implementation, but not all
compositors support this. PresentWait would either have to be exposed
nowhere, or have weird/complicated fallback paths to try to enable it
on systems where presentation-time is unavailable.

Since PresentWait2 has a surface capability, we can simply not expose it
on Wayland when present-time is unavailable instead of always having to
have a less compliant fallback path.

PresentWait2 also explicitly forbids waiting on an ID that hasn't been
queued for presentation, so we don't need to handle that weird case.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35414>
This commit is contained in:
Derek Foreman 2024-06-19 10:02:44 -05:00 • committed by Marge Bot
parent 29eb9ec7b7
commit bf285c3be9
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/vulkan/wsi/wsi_common.c
View file

@ -1383,6 +1383,8 @@ wsi_common_queue_present(const struct wsi_device *wsi,
vk_find_struct_const(pPresentInfo->pNext, PRESENT_REGIONS_KHR); vk_find_struct_const(pPresentInfo->pNext, PRESENT_REGIONS_KHR);
const VkPresentIdKHR *present_ids = const VkPresentIdKHR *present_ids =
vk_find_struct_const(pPresentInfo->pNext, PRESENT_ID_KHR); vk_find_struct_const(pPresentInfo->pNext, PRESENT_ID_KHR);
const VkPresentId2KHR *present_ids2 =
vk_find_struct_const(pPresentInfo->pNext, PRESENT_ID_2_KHR);
const VkSwapchainPresentFenceInfoEXT *present_fence_info = const VkSwapchainPresentFenceInfoEXT *present_fence_info =
vk_find_struct_const(pPresentInfo->pNext, SWAPCHAIN_PRESENT_FENCE_INFO_EXT); vk_find_struct_const(pPresentInfo->pNext, SWAPCHAIN_PRESENT_FENCE_INFO_EXT);
const VkSwapchainPresentModeInfoEXT *present_mode_info = const VkSwapchainPresentModeInfoEXT *present_mode_info =
@ -1574,6 +1576,10 @@ wsi_common_queue_present(const struct wsi_device *wsi,
uint64_t present_id = 0; uint64_t present_id = 0;
if (present_ids && present_ids->pPresentIds) if (present_ids && present_ids->pPresentIds)
present_id = present_ids->pPresentIds[i]; present_id = present_ids->pPresentIds[i];
if (present_ids2 && present_ids2->pPresentIds) {
assert(present_id == 0);
present_id = present_ids2->pPresentIds[i];
}
VkFence present_fence = VK_NULL_HANDLE; VkFence present_fence = VK_NULL_HANDLE;
if (present_fence_info && present_fence_info->pFences) if (present_fence_info && present_fence_info->pFences)
present_fence = present_fence_info->pFences[i]; present_fence = present_fence_info->pFences[i];
@ -2341,6 +2347,15 @@ wsi_WaitForPresentKHR(VkDevice device, VkSwapchainKHR _swapchain,
return swapchain->wait_for_present(swapchain, presentId, timeout); return swapchain->wait_for_present(swapchain, presentId, timeout);
} }
VKAPI_ATTR VkResult VKAPI_CALL
wsi_WaitForPresent2KHR(VkDevice device, VkSwapchainKHR _swapchain,
const VkPresentWait2InfoKHR *info)
{
VK_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
assert(swapchain->wait_for_present2);
return swapchain->wait_for_present2(swapchain, info->presentId, info->timeout);
}
VkImageUsageFlags VkImageUsageFlags
wsi_caps_get_image_usage(void) wsi_caps_get_image_usage(void)
{ {

3
src/vulkan/wsi/wsi_common_private.h
View file

@ -220,6 +220,9 @@ struct wsi_swapchain {
VkResult (*wait_for_present)(struct wsi_swapchain *swap_chain, VkResult (*wait_for_present)(struct wsi_swapchain *swap_chain,
uint64_t present_id, uint64_t present_id,
uint64_t timeout); uint64_t timeout);
VkResult (*wait_for_present2)(struct wsi_swapchain *swap_chain,
uint64_t present_id,
uint64_t timeout);
VkResult (*release_images)(struct wsi_swapchain *swap_chain, VkResult (*release_images)(struct wsi_swapchain *swap_chain,
uint32_t count, uint32_t count,
const uint32_t *indices); const uint32_t *indices);