diff options
author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-01-04 21:04:11 +0100 |
---|---|---|
committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2014-01-04 21:18:46 +0100 |
commit | 8a130e08e2d3b3fbdfd61e1e491addb5d606394b (patch) | |
tree | 8c9d002d9b6923db568fdead9b11dc216e2bb313 /video/out/gl_wayland.c | |
parent | 68e179bcf0694ad921cd18812825cbd2f1d862ca (diff) | |
download | mpv-8a130e08e2d3b3fbdfd61e1e491addb5d606394b.tar.bz2 mpv-8a130e08e2d3b3fbdfd61e1e491addb5d606394b.tar.xz |
Revert "wayland/egl: use redraw callback"
Because of this commit there were problems displaying the frmase in their right
order.
This reverts commit 96e75d234a4df1a09f38eaf932d00d79dccdc324.
Conflicts:
video/out/gl_wayland.c
video/out/wayland_common.h
Diffstat (limited to 'video/out/gl_wayland.c')
-rw-r--r-- | video/out/gl_wayland.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c index b192a2396d..2d4d24ce37 100644 --- a/video/out/gl_wayland.c +++ b/video/out/gl_wayland.c @@ -196,35 +196,10 @@ static void releaseGlContext_wayland(MPGLContext *ctx) wl->egl_context.egl.ctx = NULL; } -static const struct wl_callback_listener frame_listener; - -static void frame_handle_redraw(void *data, - struct wl_callback *callback, - uint32_t time) - -{ - MPGLContext *ctx = data; - struct vo_wayland_state *wl = ctx->vo->wayland; - - if (callback) - wl_callback_destroy(callback); - - wl->egl_context.redraw_callback = wl_surface_frame(wl->window.surface); - wl_callback_add_listener(wl->egl_context.redraw_callback, &frame_listener, ctx); - - eglSwapBuffers(wl->egl_context.egl.dpy, wl->egl_context.egl_surface); -} - -static const struct wl_callback_listener frame_listener = { - frame_handle_redraw -}; - static void swapGlBuffers_wayland(MPGLContext *ctx) { struct vo_wayland_state *wl = ctx->vo->wayland; - - if (!wl->egl_context.redraw_callback) - frame_handle_redraw(ctx, NULL, 0); + eglSwapBuffers(wl->egl_context.egl.dpy, wl->egl_context.egl_surface); } static int control(struct vo *vo, int *events, int request, void *data) |