From 3ada7ec83ace0be56119ca8b14a568f0efb27cde Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 1 Dec 2010 09:42:10 -0500 Subject: [PATCH] compositor-wayland: Call wlsc_compositor_finish_frame from frame callback --- compositor/compositor-wayland.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c index e5d0d84..3ac8c5f 100644 --- a/compositor/compositor-wayland.c +++ b/compositor/compositor-wayland.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "wayland-client.h" @@ -170,11 +169,18 @@ wayland_compositor_init_egl(struct wayland_compositor *c) } static void +frame_callback(void *data, uint32_t time) +{ + struct wayland_compositor *c = (struct wayland_compositor *) data; + + wlsc_compositor_finish_frame(&c->base, time); +} + +static void wayland_compositor_present(struct wlsc_compositor *base) { struct wayland_compositor *c = (struct wayland_compositor *) base; struct wayland_output *output; - struct timeval tv; uint32_t msec; glFlush(); @@ -193,10 +199,7 @@ wayland_compositor_present(struct wlsc_compositor *base) output->base.width, output->base.height); } - - gettimeofday(&tv, NULL); - msec = tv.tv_sec * 1000 + tv.tv_usec / 1000; - wlsc_compositor_finish_frame(&c->base, msec); + wl_display_frame_callback(c->parent.display, frame_callback, c); } static int -- 2.7.4