brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/surface: Clear texture when attaching NULL

Browse Source 
When 252e64a0eae61735a912d41817c6e6f24824146b moved the texture
ownership to MetaWaylandSurface, it failed to handle the case when a
NULL-buffer is attached, leaving the texture reference in place. This
caused issues when the surface should have been hidden (e.g. attaching a
NULL buffer to a cursor surface for hiding the cursor sprite).

Related: https://gitlab.gnome.org/GNOME/mutter/issues/630
This commit is contained in:
Jonas Ådahl 2019-06-07 15:49:40 +02:00 committed by Georges Basile Stavracas Neto
parent 9b53583945
commit 5eac1d696d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland-surface.c
View File

@ -737,6 +737,10 @@ meta_wayland_surface_apply_pending_state (MetaWaylandSurface *surface,
g_clear_pointer (&snippet, cogl_object_unref); g_clear_pointer (&snippet, cogl_object_unref);
} }
} }
else
{
cogl_clear_object (&surface->texture);
}
/* If the newly attached buffer is going to be accessed directly without /* If the newly attached buffer is going to be accessed directly without
* making a copy, such as an EGL buffer, mark it as in-use don't release * making a copy, such as an EGL buffer, mark it as in-use don't release