RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-08 07:08:12 +00:00
Code Issues Releases Wiki Activity

gl_wayland: eglSwapInterval(0) to avoid blocking

Browse Source 
This makes mesa not wait for frame callback internally.
This commit is contained in:
Jari Vetoniemi 2015-08-19 22:39:52 +03:00 committed by wm4
parent b144da63a8
commit 3245bfefc3
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
video/out/gl_common.h
View File

@ -136,11 +136,6 @@ typedef struct MPGLContext {
// Resize the window, or create a new window if there isn't one yet. // Resize the window, or create a new window if there isn't one yet.
// On the first call, it creates a GL context. // On the first call, it creates a GL context.
bool (*config_window)(struct MPGLContext *ctx, int flags); bool (*config_window)(struct MPGLContext *ctx, int flags);
// Optional callback on the beginning of a frame. The frame will be finished
// with swapGlBuffers(). This returns false if use of the OpenGL context
// should be avoided.
bool (*start_frame)(struct MPGLContext *);
} MPGLContext; } MPGLContext;
MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, int vo_flags); MPGLContext *mpgl_init(struct vo *vo, const char *backend_name, int vo_flags);

24
video/out/gl_wayland.c
View File

@ -144,6 +144,20 @@ static void egl_create_window(struct vo_wayland_state *wl)
wl->egl_context.egl.ctx); wl->egl_context.egl.ctx);
wl_display_dispatch_pending(wl->display.display); wl_display_dispatch_pending(wl->display.display);
/**
* <http://lists.freedesktop.org/archives/wayland-devel/2013-November/012019.html>
*
* The main change is that if the swap interval is 0 then Mesa won't install a
* frame callback so that eglSwapBuffers can be executed as often as necessary.
* Instead it will do a sync request after the swap buffers. It will block for
* sync complete event in get_back_bo instead of the frame callback. The
* compositor is likely to send a release event while processing the new buffer
* attach and this makes sure we will receive that before deciding whether to
* allocate a new buffer.
*/
eglSwapInterval(wl->egl_context.egl.dpy, 0);
} }
static bool config_window_wayland(struct MPGLContext *ctx, int flags) static bool config_window_wayland(struct MPGLContext *ctx, int flags)
@ -196,11 +210,8 @@ static void swapGlBuffers_wayland(MPGLContext *ctx)
{ {
struct vo_wayland_state *wl = ctx->vo->wayland; struct vo_wayland_state *wl = ctx->vo->wayland;
if (!wl->frame.pending)
return;
eglSwapBuffers(wl->egl_context.egl.dpy, wl->egl_context.egl_surface); eglSwapBuffers(wl->egl_context.egl.dpy, wl->egl_context.egl_surface);
wl->frame.pending = false;
} }
static int control(struct vo *vo, int *events, int request, void *data) static int control(struct vo *vo, int *events, int request, void *data)
@ -214,12 +225,6 @@ static int control(struct vo *vo, int *events, int request, void *data)
return r; return r;
} }
static bool start_frame(struct MPGLContext *ctx)
{
struct vo_wayland_state *wl = ctx->vo->wayland;
return wl->frame.pending;
}
void mpgl_set_backend_wayland(MPGLContext *ctx) void mpgl_set_backend_wayland(MPGLContext *ctx)
{ {
ctx->config_window = config_window_wayland; ctx->config_window = config_window_wayland;
@ -228,5 +233,4 @@ void mpgl_set_backend_wayland(MPGLContext *ctx)
ctx->vo_control = control; ctx->vo_control = control;
ctx->vo_init = vo_wayland_init; ctx->vo_init = vo_wayland_init;
ctx->vo_uninit = vo_wayland_uninit; ctx->vo_uninit = vo_wayland_uninit;
ctx->start_frame = start_frame;
} }

3
video/out/vo_opengl.c
View File

@ -169,9 +169,6 @@ static void draw_frame(struct vo *vo, struct vo_frame *frame)
struct gl_priv *p = vo->priv; struct gl_priv *p = vo->priv;
GL *gl = p->gl; GL *gl = p->gl;
if (p->glctx->start_frame && !p->glctx->start_frame(p->glctx))
return;
p->frame_started = true; p->frame_started = true;
gl_video_render_frame(p->renderer, frame, 0); gl_video_render_frame(p->renderer, frame, 0);