mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-28 07:58:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: add "acquire" to vulkan_sync_foreign_texture()

Browse source 
Makes it more obvious that this is about the acquire side, not the
release side.

(cherry picked from commit 8c8d6363a1)
This commit is contained in:
Simon Ser 2026-02-14 18:06:40 +01:00 • committed by Simon Zeni
parent a34411c2fe
commit 6fee18f373
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/render/vulkan.h
View file

@ -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, bool vulkan_sync_render_pass_release(struct wlr_vk_renderer *renderer,
struct wlr_vk_render_pass *pass); 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]); int sync_file_fds[static WLR_DMABUF_MAX_PLANES]);
bool vulkan_read_pixels(struct wlr_vk_renderer *vk_renderer, bool vulkan_read_pixels(struct wlr_vk_renderer *vk_renderer,

2
render/vulkan/pass.c
View file

@ -314,7 +314,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
sync_file_fds[0] = sync_file_fd; sync_file_fds[0] = sync_file_fd;
} else { } else {
struct wlr_vk_texture *texture = pass_texture->texture; 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"); wlr_log(WLR_ERROR, "Failed to wait for foreign texture DMA-BUF fence");
continue; continue;
} }

2
render/vulkan/renderer.c
View file

@ -990,7 +990,7 @@ static bool buffer_export_sync_file(struct wlr_vk_renderer *renderer, struct wlr
return true; 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]) { 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); return buffer_export_sync_file(texture->renderer, texture->buffer, DMA_BUF_SYNC_READ, sync_file_fds);
} }