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

venus: refactor vn_AcquireNextImage2KHR

Browse source 
Prepare for valid implicit in-fence.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39401>
(cherry picked from commit 211c21725c)
This commit is contained in:
Yiwei Zhang 2026-01-18 23:38:38 -08:00 • committed by Eric Engestrom
parent 29b37e4484
commit e0af337416
2 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3854,7 +3854,7 @@
"description": "venus: refactor vn_AcquireNextImage2KHR",
"nominated": false,
"nomination_type": 0,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

48
src/virtio/vulkan/vn_wsi.c
View file

@ -854,17 +854,43 @@ vn_AcquireNextImage2KHR(VkDevice device,
return vn_error(dev->instance, result);
/* XXX this relies on renderer side doing implicit fencing */
int sync_fd = -1;
int sem_fd = -1, fence_fd = -1;
if (sync_fd >= 0) {
if (pAcquireInfo->semaphore != VK_NULL_HANDLE &&
pAcquireInfo->fence != VK_NULL_HANDLE) {
sem_fd = sync_fd;
fence_fd = dup(sync_fd);
if (fence_fd < 0) {
result = errno == EMFILE ? VK_ERROR_TOO_MANY_OBJECTS
: VK_ERROR_OUT_OF_HOST_MEMORY;
close(sync_fd);
return vn_error(dev->instance, result);
}
} else if (pAcquireInfo->semaphore != VK_NULL_HANDLE) {
sem_fd = sync_fd;
} else {
assert(pAcquireInfo->fence != VK_NULL_HANDLE);
fence_fd = sync_fd;
}
}
if (pAcquireInfo->semaphore != VK_NULL_HANDLE) {
const VkImportSemaphoreFdInfoKHR info = {
.sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
.semaphore = pAcquireInfo->semaphore,
.flags = VK_SEMAPHORE_IMPORT_TEMPORARY_BIT,
.handleType = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT,
.fd = -1,
.fd = sem_fd,
};
VkResult ret = vn_ImportSemaphoreFdKHR(device, &info);
if (ret != VK_SUCCESS)
return vn_error(dev->instance, ret);
if (ret == VK_SUCCESS) {
sem_fd = -1;
} else {
result = ret;
goto out;
}
}
if (pAcquireInfo->fence != VK_NULL_HANDLE) {
@ -873,13 +899,23 @@ vn_AcquireNextImage2KHR(VkDevice device,
.fence = pAcquireInfo->fence,
.flags = VK_FENCE_IMPORT_TEMPORARY_BIT,
.handleType = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT,
.fd = -1,
.fd = fence_fd,
};
VkResult ret = vn_ImportFenceFdKHR(device, &info);
if (ret != VK_SUCCESS)
return vn_error(dev->instance, ret);
if (ret == VK_SUCCESS) {
fence_fd = -1;
} else {
result = ret;
goto out;
}
}
out:
if (sem_fd >= 0)
close(sem_fd);
if (fence_fd >= 0)
close(fence_fd);
return vn_result(dev->instance, result);
}