OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wsi/x11: Implement VK_EXT_swapchain_maintenance1.

Browse Source 
Allow toggling between all presentation modes.
After the rewrite, this is now trivial to support.

Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26954>
This commit is contained in:
Hans-Kristian Arntzen
2024-01-18 16:48:44 +01:00
committed by Marge Bot
parent 19dba854be
commit b90b6a395d
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/vulkan/wsi/wsi_common_x11.c
View File

@@ -781,21 +781,30 @@ x11_surface_get_capabilities2(VkIcdSurfaceBase *icd_surface,
}
case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_COMPATIBILITY_EXT: {
/* To be able to toggle between FIFO and non-FIFO, we would need a rewrite to always use FIFO thread
* mechanism. For now, only return the input, making this effectively unsupported. */
/* All present modes are compatible with each other. */
VkSurfacePresentModeCompatibilityEXT *compat = (void *)ext;
if (compat->pPresentModes) {
if (compat->presentModeCount) {
assert(present_mode);
compat->pPresentModes[0] = present_mode->presentMode;
compat->presentModeCount = 1;
assert(present_mode);
VK_OUTARRAY_MAKE_TYPED(VkPresentModeKHR, modes, compat->pPresentModes, &compat->presentModeCount);
/* Must always return queried present mode even when truncating. */
vk_outarray_append_typed(VkPresentModeKHR, &modes, mode) {
*mode = present_mode->presentMode;
}
for (uint32_t i = 0; i < ARRAY_SIZE(present_modes); i++) {
if (present_modes[i] != present_mode->presentMode) {
vk_outarray_append_typed(VkPresentModeKHR, &modes, mode) {
*mode = present_modes[i];
}
}
}
} else {
if (!present_mode)
wsi_common_vk_warn_once("Use of VkSurfacePresentModeCompatibilityEXT "
"without a VkSurfacePresentModeEXT set. This is an "
"application bug.\n");
compat->presentModeCount = 1;
compat->presentModeCount = ARRAY_SIZE(present_modes);
}
break;
}
@@ -1542,6 +1551,14 @@ x11_release_images(struct wsi_swapchain *wsi_chain,
return VK_SUCCESS;
}
static void
x11_set_present_mode(struct wsi_swapchain *wsi_chain,
VkPresentModeKHR mode)
{
struct x11_swapchain *chain = (struct x11_swapchain *)wsi_chain;
chain->base.present_mode = mode;
}
/**
* Acquire a ready-to-use image from the swapchain.
*
@@ -2404,6 +2421,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
chain->base.queue_present = x11_queue_present;
chain->base.wait_for_present = x11_wait_for_present;
chain->base.release_images = x11_release_images;
chain->base.set_present_mode = x11_set_present_mode;
chain->base.present_mode = present_mode;
chain->base.image_count = num_images;
chain->conn = conn;