From 6fee18f373218d827a2df33b1c93b71df202ee41 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sat, 14 Feb 2026 18:06:40 +0100 Subject: [PATCH] render/vulkan: add "acquire" to vulkan_sync_foreign_texture() Makes it more obvious that this is about the acquire side, not the release side. (cherry picked from commit 8c8d6363a19e04054071f6983423c4eb760bf86b) --- include/render/vulkan.h | 2 +- render/vulkan/pass.c | 2 +- render/vulkan/renderer.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/render/vulkan.h b/include/render/vulkan.h index 4f078dcb4..f2a28aa3c 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -435,7 +435,7 @@ bool vulkan_wait_command_buffer(struct wlr_vk_command_buffer *cb, bool vulkan_sync_render_pass_release(struct wlr_vk_renderer *renderer, struct wlr_vk_render_pass *pass); -bool vulkan_sync_foreign_texture(struct wlr_vk_texture *texture, +bool vulkan_sync_foreign_texture_acquire(struct wlr_vk_texture *texture, int sync_file_fds[static WLR_DMABUF_MAX_PLANES]); bool vulkan_read_pixels(struct wlr_vk_renderer *vk_renderer, diff --git a/render/vulkan/pass.c b/render/vulkan/pass.c index ef6dd8f0d..1e1fadbee 100644 --- a/render/vulkan/pass.c +++ b/render/vulkan/pass.c @@ -314,7 +314,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) { sync_file_fds[0] = sync_file_fd; } else { struct wlr_vk_texture *texture = pass_texture->texture; - if (!vulkan_sync_foreign_texture(texture, sync_file_fds)) { + if (!vulkan_sync_foreign_texture_acquire(texture, sync_file_fds)) { wlr_log(WLR_ERROR, "Failed to wait for foreign texture DMA-BUF fence"); continue; } diff --git a/render/vulkan/renderer.c b/render/vulkan/renderer.c index 35c7185ba..2fc9e68cf 100644 --- a/render/vulkan/renderer.c +++ b/render/vulkan/renderer.c @@ -990,7 +990,7 @@ static bool buffer_export_sync_file(struct wlr_vk_renderer *renderer, struct wlr return true; } -bool vulkan_sync_foreign_texture(struct wlr_vk_texture *texture, +bool vulkan_sync_foreign_texture_acquire(struct wlr_vk_texture *texture, int sync_file_fds[static WLR_DMABUF_MAX_PLANES]) { return buffer_export_sync_file(texture->renderer, texture->buffer, DMA_BUF_SYNC_READ, sync_file_fds); }