Implement buffer.release event
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 0dcfc7c..4eb2b35 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -162,6 +162,32 @@
fabs(spring->current - spring->target) < 0.0002;
}
+static void
+surface_handle_buffer_destroy(struct wl_listener *listener,
+ struct wl_resource *resource, uint32_t time)
+{
+ struct wlsc_surface *es = container_of(listener, struct wlsc_surface,
+ buffer_destroy_listener);
+ struct wl_buffer *buffer = (struct wl_buffer *) resource;
+
+ if (es->buffer == buffer)
+ es->buffer = NULL;
+}
+
+static void
+output_handle_scanout_buffer_destroy(struct wl_listener *listener,
+ struct wl_resource *resource,
+ uint32_t time)
+{
+ struct wlsc_output *output =
+ container_of(listener, struct wlsc_output,
+ scanout_buffer_destroy_listener);
+ struct wl_buffer *buffer = (struct wl_buffer *) resource;
+
+ if (output->scanout_buffer == buffer)
+ output->scanout_buffer = NULL;
+}
+
WL_EXPORT struct wlsc_surface *
wlsc_surface_create(struct wlsc_compositor *compositor,
int32_t x, int32_t y, int32_t width, int32_t height)
@@ -192,6 +218,11 @@
surface->width = width;
surface->height = height;
+ surface->buffer = NULL;
+
+ surface->buffer_destroy_listener.func = surface_handle_buffer_destroy;
+ wl_list_init(&surface->buffer_destroy_listener.link);
+
surface->transform = NULL;
return surface;
@@ -243,6 +274,8 @@
else
glDeleteTextures(1, &surface->saved_texture);
+ if (surface->buffer)
+ wl_list_remove(&surface->buffer_destroy_listener.link);
if (surface->image != EGL_NO_IMAGE_KHR)
compositor->destroy_image(compositor->display,
@@ -312,6 +345,9 @@
}
es->visual = sprite->visual;
+
+ if (es->buffer)
+ es->buffer = NULL;
}
enum sprite_usage {
@@ -574,12 +610,33 @@
wlsc_output_damage(output);
}
+static inline void
+wlsc_buffer_post_release(struct wl_buffer *buffer)
+{
+ if (buffer->client == NULL) {
+ fprintf(stderr, "buffer.release warning: buffer.client: %p\n",
+ buffer->client);
+ return;
+ }
+
+ wl_client_post_event(buffer->client,
+ &buffer->resource.object,
+ WL_BUFFER_RELEASE);
+}
+
WL_EXPORT void
wlsc_output_finish_frame(struct wlsc_output *output, int msecs)
{
struct wlsc_compositor *compositor = output->compositor;
struct wlsc_animation *animation, *next;
+ if (output->scanout_buffer) {
+ if (--output->scanout_buffer->busy_count == 0)
+ wlsc_buffer_post_release(output->scanout_buffer);
+
+ output->scanout_buffer = NULL;
+ }
+
output->finished = 1;
wl_event_source_timer_update(compositor->timer_source, 5);
@@ -716,6 +773,13 @@
&ec->damage_region,
&total_damage);
+ output->scanout_buffer = es->buffer;
+ output->scanout_buffer->busy_count++;
+
+ wl_list_remove(&output->scanout_buffer_destroy_listener.link);
+ wl_list_insert(output->scanout_buffer->resource.destroy_listener_list.prev,
+ &output->scanout_buffer_destroy_listener.link);
+
wlsc_output_finish_redraw(output,
wlsc_compositor_get_time());
return;
@@ -869,6 +933,17 @@
{
struct wlsc_surface *es = (struct wlsc_surface *) surface;
+ buffer->busy_count++;
+
+ if (es->buffer && es->buffer->busy_count > 0)
+ if (--es->buffer->busy_count == 0)
+ wlsc_buffer_post_release(es->buffer);
+
+ es->buffer = buffer;
+ wl_list_remove(&es->buffer_destroy_listener.link);
+ wl_list_insert(es->buffer->resource.destroy_listener_list.prev,
+ &es->buffer_destroy_listener.link);
+
es->x += x;
es->y += y;
es->width = buffer->width;
@@ -1641,6 +1716,10 @@
output->finished = 1;
wlsc_output_move(output, x, y);
+ output->scanout_buffer_destroy_listener.func =
+ output_handle_scanout_buffer_destroy;
+ wl_list_init(&output->scanout_buffer_destroy_listener.link);
+
output->object.interface = &wl_output_interface;
wl_display_add_object(c->wl_display, &output->object);
wl_display_add_global(c->wl_display, &output->object,