mirror of
https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git
synced 2025-12-20 15:00:09 +01:00
cedf53a2be
Fixes the following issues: * For Wayland backend, populates the presentation feedback listener with all callbacks as it is considered a fault by the protocol to not implement those * For Wayland backend presentation feedback listener, forwards the feedback_discarded event to present ID as there could be situations where previously submitted buffers are discarded, such as when swapchains are using the MAILBOX presentation mode. * For all swapchains, communicate critical errors back to present wait extension as otherwise, all callers waiting that are waiting on present to be delivered in vkWaitForPresentKHR call will never exit. * Expanded the implementation in vkWaitForPresentKHR to be able to return critical swapchain errors if they have occured during the wait time. * Fix issues in present ID where infinite waits could result in the vkWaitForPresentKHR call returning immediately due to UINT64_MAX timeout resulting in overflowing the system clock used in std::condition_variable Change-Id: I1e475c3073c05394db259657eae1da21764a5a5c Signed-off-by: Normunds Rieksts <normunds.rieksts@arm.com> Signed-off-by: Alex Bates <alex.bates@arm.com>
55 lines
2.1 KiB
C++
55 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2025 Arm Limited.
|
|
*
|
|
* SPDX-License-Identifier: MIT
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
/**
|
|
* @file present_wait_api.cpp
|
|
*
|
|
* @brief Contains the Vulkan entrypoints for the present wait.
|
|
*/
|
|
#include <cassert>
|
|
#include <wsi/extensions/present_wait.hpp>
|
|
#include <wsi/swapchain_base.hpp>
|
|
|
|
#include "present_wait_api.hpp"
|
|
|
|
/**
|
|
* @brief Implements vkSetSwapchainPresentTimingQueueSizeEXT Vulkan entrypoint.
|
|
*/
|
|
VWL_VKAPI_CALL(VkResult)
|
|
wsi_layer_vkWaitForPresentKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t present_id,
|
|
uint64_t timeout) VWL_API_POST
|
|
{
|
|
assert(swapchain != VK_NULL_HANDLE);
|
|
|
|
auto &device_data = layer::device_private_data::get(device);
|
|
if (!device_data.layer_owns_swapchain(swapchain))
|
|
{
|
|
return device_data.disp.WaitForPresentKHR(device, swapchain, present_id, timeout);
|
|
}
|
|
|
|
auto *sc = reinterpret_cast<wsi::swapchain_base *>(swapchain);
|
|
auto *ext = sc->get_swapchain_extension<wsi::wsi_ext_present_wait>(true);
|
|
|
|
return ext->wait_for_present_id(present_id, timeout);
|
|
}
|