summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2014-01-04 17:26:55 +0100
committerwm4 <wm4@nowhere>2014-01-06 20:22:11 +0100
commit4b2a3e50e25f488e170c2a77c048d38b6fb3f85a (patch)
treec515ee5202567b7cec0760e2c2637d95f7b5649d
parent35b01c9604163fa3a168d7085b6c3c20a301ccd6 (diff)
downloadmpv-4b2a3e50e25f488e170c2a77c048d38b6fb3f85a.tar.bz2
mpv-4b2a3e50e25f488e170c2a77c048d38b6fb3f85a.tar.xz
wayland/egl: misc fixes and cleanups
-rw-r--r--video/out/gl_wayland.c6
-rw-r--r--video/out/wayland_common.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c
index ddc12c2486..b192a2396d 100644
--- a/video/out/gl_wayland.c
+++ b/video/out/gl_wayland.c
@@ -104,7 +104,7 @@ static bool egl_create_context(struct vo_wayland_state *wl,
if (!wl->egl_context.egl.ctx) {
/* fallback to any GL version */
MP_WARN(wl, "can't create context for requested OpenGL version: "
- "fall back to any version available");
+ "fall back to any version available\n");
context_attribs[0] = EGL_NONE;
wl->egl_context.egl.ctx = eglCreateContext(wl->egl_context.egl.dpy,
wl->egl_context.egl.conf,
@@ -209,8 +209,6 @@ static void frame_handle_redraw(void *data,
if (callback)
wl_callback_destroy(callback);
- //struct wl_callback *tmp = wl_surface_frame(wl->window.surface);
- //wl_callback_add_listener(tmp, &frame_listener, ctx);
wl->egl_context.redraw_callback = wl_surface_frame(wl->window.surface);
wl_callback_add_listener(wl->egl_context.redraw_callback, &frame_listener, ctx);
@@ -224,7 +222,6 @@ static const struct wl_callback_listener frame_listener = {
static void swapGlBuffers_wayland(MPGLContext *ctx)
{
struct vo_wayland_state *wl = ctx->vo->wayland;
-// eglSwapBuffers(wl->egl_context.egl.dpy, wl->egl_context.egl_surface);
if (!wl->egl_context.redraw_callback)
frame_handle_redraw(ctx, NULL, 0);
@@ -235,7 +232,6 @@ static int control(struct vo *vo, int *events, int request, void *data)
struct vo_wayland_state *wl = vo->wayland;
int r = vo_wayland_control(vo, events, request, data);
- // NOTE: VO_EVENT_EXPOSE is never returned by the wayland backend
if (*events & VO_EVENT_RESIZE)
egl_resize(wl);
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index 152b438220..9289e53b31 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -61,7 +61,6 @@ struct vo_wayland_state {
EGLConfig conf;
} egl;
-
struct wl_callback * redraw_callback;
} egl_context;
#endif