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

vulkan: handle wsi private data properly

Browse source 
On Android, Vulkan loader implements KHR_swapchain and owns both surface
and swapchain handles. On non-Android, common wsi implements the same and
owns the same. So for both cases, the drivers are unable to handle
vkGet/SetPrivateData call on either a surface or a swapchain.

Inspired by https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37043

Cc: mesa-stable
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Ryan Zhang <ryan.zhang@nxp.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37064>
This commit is contained in:
Yiwei Zhang 2025-08-28 16:47:23 +00:00 • committed by Marge Bot
parent 564b6fd7f4
commit 6e1c2e4d83
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/vulkan/runtime/vk_object.c
View file

@ -235,20 +235,19 @@ vk_object_base_private_data(struct vk_device *device,
{
VK_FROM_HANDLE(vk_private_data_slot, slot, privateDataSlot);
/* There is an annoying spec corner here on Android. Because WSI is
* implemented in the Vulkan loader which doesn't know about the
* VK_EXT_private_data extension, we have to handle VkSwapchainKHR in the
* driver as a special case. On future versions of Android where the
* loader does understand VK_EXT_private_data, we'll never see a
* vkGet/SetPrivateData call on a swapchain because the loader will
* handle it.
/* On Android, Vulkan loader implements KHR_swapchain and owns both surface
* and swapchain handles. On non-Android, common wsi implements the same and
* owns the same. So for both cases, the drivers are unable to handle
* vkGet/SetPrivateData call on either a surface or a swapchain.
*
* For later (or not):
* - if common wsi handles surface and swapchain private data, the workaround
* for common wsi can be dropped
* - if Android loader handles surface and swapchain private data, the same
* may be gated upon Android platform version
*/
#ifdef VK_USE_PLATFORM_ANDROID_KHR
if (objectType == VK_OBJECT_TYPE_SWAPCHAIN_KHR ||
objectType == VK_OBJECT_TYPE_SURFACE_KHR) {
#else
if (objectType == VK_OBJECT_TYPE_SURFACE_KHR) {
#endif
mtx_lock(&device->swapchain_private_mtx);
VkResult result = get_swapchain_private_data_locked(device, objectHandle,
slot, private_data);