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

wayland: Make MetaWaylandBufferRef reference counted

Browse Source 
So that we can have a more dynamic ownership.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/798
This commit is contained in:
Jonas Ådahl 2019-09-11 21:52:58 +02:00
parent bc178b711f
commit f36120757f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,14 +126,20 @@ meta_wayland_buffer_ref_new (void)
MetaWaylandBufferRef *buffer_ref; MetaWaylandBufferRef *buffer_ref;
buffer_ref = g_new0 (MetaWaylandBufferRef, 1); buffer_ref = g_new0 (MetaWaylandBufferRef, 1);
g_ref_count_init (&buffer_ref->ref_count);
return buffer_ref; return buffer_ref;
} }
static void static void
meta_wayland_buffer_ref_free (MetaWaylandBufferRef *buffer_ref) meta_wayland_buffer_ref_unref (MetaWaylandBufferRef *buffer_ref)
{ {
if (g_ref_count_dec (&buffer_ref->ref_count))
{
g_warn_if_fail (buffer_ref->use_count == 0);
g_clear_object (&buffer_ref->buffer);
g_free (buffer_ref); g_free (buffer_ref);
}
} }
static void static void
@ -1295,8 +1301,7 @@ wl_surface_destructor (struct wl_resource *resource)
if (surface->buffer_held) if (surface->buffer_held)
meta_wayland_surface_unref_buffer_use_count (surface); meta_wayland_surface_unref_buffer_use_count (surface);
g_clear_pointer (&surface->texture, cogl_object_unref); g_clear_pointer (&surface->texture, cogl_object_unref);
g_clear_object (&surface->buffer_ref->buffer); g_clear_pointer (&surface->buffer_ref, meta_wayland_buffer_ref_unref);
g_clear_pointer (&surface->buffer_ref, meta_wayland_buffer_ref_free);
g_clear_object (&surface->cached_state); g_clear_object (&surface->cached_state);
g_clear_object (&surface->pending_state); g_clear_object (&surface->pending_state);

1
src/wayland/meta-wayland-surface.h
View File

@ -138,6 +138,7 @@ struct _MetaWaylandDragDestFuncs
typedef struct _MetaWaylandBufferRef typedef struct _MetaWaylandBufferRef
{ {
grefcount ref_count;
MetaWaylandBuffer *buffer; MetaWaylandBuffer *buffer;
unsigned int use_count; unsigned int use_count;
} MetaWaylandBufferRef; } MetaWaylandBufferRef;