compositor-wayland: Call wlsc_compositor_finish_frame from frame callback

diff --git a/compositor/compositor-wayland.c b/compositor/compositor-wayland.c
index e5d0d842489be8039922f077329ecd0344763776..3ac8c5f1349a34a1c3b3e9526adee6cb47dfadc5 100644 (file)
--- a/compositor/compositor-wayland.c
+++ b/compositor/compositor-wayland.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/time.h>
 
 #include "wayland-client.h"
 
@@ -169,12 +168,19 @@ wayland_compositor_init_egl(struct wayland_compositor *c)
        return 0;
 }
 
+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