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

wsi/common: Do not update present mode with MESA_VK_WSI_PRESENT_MODE.

Browse source 
Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
Reviewed-by: Sebastian Wick <sebastian.wick@redhat.com>
Fixes: ad71d584cf ("wsi/common: Add function to modify present mode.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30434>
(cherry picked from commit 369e3cc20a)
This commit is contained in:
Hans-Kristian Arntzen 2024-07-31 10:07:03 +02:00 • committed by Eric Engestrom
parent 807b8b7249
commit 568a691eba
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -6454,7 +6454,7 @@
"description": "wsi/common: Do not update present mode with MESA_VK_WSI_PRESENT_MODE.", "description": "wsi/common: Do not update present mode with MESA_VK_WSI_PRESENT_MODE.",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "ad71d584cfbe588c54b2b3eaa2e6aa94af68e305", "because_sha": "ad71d584cfbe588c54b2b3eaa2e6aa94af68e305",
"notes": null "notes": null

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

@ -1380,9 +1380,14 @@ wsi_common_queue_present(const struct wsi_device *wsi,
uint32_t image_index = pPresentInfo->pImageIndices[i]; uint32_t image_index = pPresentInfo->pImageIndices[i];
VkResult result; VkResult result;
/* Update the present mode for this present and any subsequent present. */ /* Update the present mode for this present and any subsequent present.
if (present_mode_info && present_mode_info->pPresentModes && swapchain->set_present_mode) * Only update the present mode when MESA_VK_WSI_PRESENT_MODE is not used.
* We should also turn any VkSwapchainPresentModesCreateInfoEXT into a nop,
* but none of the WSI backends use that currently. */
if (present_mode_info && present_mode_info->pPresentModes &&
swapchain->set_present_mode && wsi->override_present_mode == VK_PRESENT_MODE_MAX_ENUM_KHR) {
swapchain->set_present_mode(swapchain, present_mode_info->pPresentModes[i]); swapchain->set_present_mode(swapchain, present_mode_info->pPresentModes[i]);
}
if (swapchain->fences[image_index] == VK_NULL_HANDLE) { if (swapchain->fences[image_index] == VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_info = { const VkFenceCreateInfo fence_info = {