fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-11 05:48:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

compositor: Fold weston_buffer_post_release into weston_buffer_reference

Browse source 
Nothing else calls weston_buffer_post_release and the ref-counting and
sending the release event is essentially what weston_buffer_reference is
all about.
This commit is contained in:
Kristian Høgsberg 2013-03-04 12:07:46 -05:00
parent 63093a35ea
commit 2034780cb2
2 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compositor.c
View file

@ -998,7 +998,12 @@ weston_buffer_reference(struct weston_buffer_reference *ref,
struct wl_buffer *buffer)
{
if (ref->buffer && buffer != ref->buffer) {
weston_buffer_post_release(ref->buffer);
ref->buffer->busy_count--;
if (ref->buffer->busy_count == 0) {
assert(ref->buffer->resource.client != NULL);
wl_resource_queue_event(&ref->buffer->resource,
WL_BUFFER_RELEASE);
}
wl_list_remove(&ref->destroy_listener.link);
}
@ -1043,16 +1048,6 @@ weston_compositor_damage_all(struct weston_compositor *compositor)
weston_output_damage(output);
}
WL_EXPORT void
weston_buffer_post_release(struct wl_buffer *buffer)
{
if (--buffer->busy_count > 0)
return;
assert(buffer->resource.client != NULL);
wl_resource_queue_event(&buffer->resource, WL_BUFFER_RELEASE);
}
WL_EXPORT void
weston_output_damage(struct weston_output *output)
{

3
src/compositor.h
View file

@ -697,9 +697,6 @@ weston_surface_move_to_plane(struct weston_surface *surface,
void
weston_surface_unmap(struct weston_surface *surface);
void
weston_buffer_post_release(struct wl_buffer *buffer);
void
weston_buffer_reference(struct weston_buffer_reference *ref,
struct wl_buffer *buffer);