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

Merge branch 'master' into 'master'

Browse source 
linux_drm_syncobj_v1: minor fixes

See merge request wlroots/wlroots!5358
This commit is contained in:
Xu Rui 2026-05-08 07:30:58 +00:00
commit 2a2b472495
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
types/wlr_linux_drm_syncobj_v1.c
View file

@ -387,6 +387,7 @@ static void manager_handle_import_timeline(struct wl_client *client,
struct wl_resource *timeline_resource = wl_resource_create(client,
&wp_linux_drm_syncobj_timeline_v1_interface, version, id);
if (timeline_resource == NULL) {
wlr_drm_syncobj_timeline_unref(timeline);
wl_resource_post_no_memory(resource);
return;
}
@ -545,7 +546,7 @@ bool wlr_linux_drm_syncobj_v1_state_add_release_point(
bool wlr_linux_drm_syncobj_v1_state_add_release_from_implicit_sync(
struct wlr_linux_drm_syncobj_surface_v1_state *state,
struct wlr_buffer *buffer, struct wl_event_loop *event_loop) {
if (state->release_merger != NULL) {
if (state->release_merger == NULL) {
return true;
}
return wlr_drm_syncobj_merger_add_dmabuf(state->release_merger, buffer, event_loop);