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

wayland: change accessible boolean to use_count counter

Browse Source 
Since a buffer can be used by multiple surfaces at once,
we need to release the buffer only after all surfaces
are finished with it.  Currently we track whether or
not to release the buffer based on the accessible boolean.
This commit changes it to a counter to accomodate multiple
users.

Also, each surface needs to know whether not it is done with
the buffer, so this commit adds a buffer_used boolean to the
surface state.

https://bugzilla.gnome.org/show_bug.cgi?id=761613
This commit is contained in:
Ray Strode
2016-02-18 10:33:50 -05:00
parent e097bc8353
commit bed82427c6
4 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/wayland/meta-wayland-buffer.c
View File

@ -51,32 +51,30 @@ void
meta_wayland_buffer_unref (MetaWaylandBuffer *buffer)
{
buffer->ref_count--;
if (buffer->ref_count == 0)
{
g_clear_pointer (&buffer->texture, cogl_object_unref);
g_warn_if_fail (buffer->use_count == 0);
if (buffer->accessible)
meta_wayland_buffer_release_control (buffer);
g_clear_pointer (&buffer->texture, cogl_object_unref);
}
}
void
meta_wayland_buffer_take_control (MetaWaylandBuffer *buffer)
meta_wayland_buffer_ref_use_count (MetaWaylandBuffer *buffer)
{
if (buffer->accessible)
meta_fatal ("buffer control taken twice");
buffer->accessible = TRUE;
buffer->use_count++;
}
void
meta_wayland_buffer_release_control (MetaWaylandBuffer *buffer)
meta_wayland_buffer_unref_use_count (MetaWaylandBuffer *buffer)
{
if (!buffer->accessible)
meta_fatal ("buffer released when not in control");
g_return_if_fail (buffer->use_count != 0);
wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
buffer->accessible = FALSE;
buffer->use_count--;
if (buffer->use_count == 0)
wl_resource_queue_event (buffer->resource, WL_BUFFER_RELEASE);
}
MetaWaylandBuffer *
@ -114,8 +112,7 @@ meta_wayland_buffer_ensure_texture (MetaWaylandBuffer *buffer)
CoglTexture *texture;
struct wl_shm_buffer *shm_buffer;
if (!buffer->accessible)
meta_warning ("attempted to process damage on uncommitted buffer");
g_return_val_if_fail (buffer->use_count != 0, NULL);
if (buffer->texture)
goto out;
@ -150,8 +147,7 @@ meta_wayland_buffer_process_damage (MetaWaylandBuffer *buffer,
{
struct wl_shm_buffer *shm_buffer;
if (!buffer->accessible)
meta_warning ("attempted to process damage on uncommitted buffer");
g_return_if_fail (buffer->use_count != 0);
shm_buffer = wl_shm_buffer_get (buffer->resource);