From aa5f8ba542f276599ba0d8e89175520128d7c4b4 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Thu, 12 Sep 2013 16:29:13 +0200 Subject: Revert "wayland: don't create our own log context" This reverts commit beab54506e61bc080880e827e351439f76542e68. Conflicts: video/out/wayland_common.c --- video/out/gl_wayland.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'video/out/gl_wayland.c') diff --git a/video/out/gl_wayland.c b/video/out/gl_wayland.c index c361861d78..9a1b764342 100644 --- a/video/out/gl_wayland.c +++ b/video/out/gl_wayland.c @@ -24,6 +24,7 @@ #include "gl_common.h" struct egl_context { + struct mp_log *log; EGLSurface egl_surface; struct wl_egl_window *egl_window; @@ -49,10 +50,10 @@ static void egl_resize(struct vo_wayland_state *wl, &wl->window.width, &wl->window.height); - MP_DBG(wl->vo, "resizing %dx%d -> %dx%d\n", wl->window.width, - wl->window.height, - width, - height); + MP_VERBOSE(ctx, "resizing %dx%d -> %dx%d\n", wl->window.width, + wl->window.height, + width, + height); if (x != 0) x = wl->window.width - width; @@ -101,7 +102,7 @@ static bool egl_create_context(struct vo_wayland_state *wl, if (eglInitialize(egl_ctx->egl.dpy, &major, &minor) != EGL_TRUE) return false; - MP_VERBOSE(wl->vo, "EGL version %d.%d\n", major, minor); + MP_VERBOSE(egl_ctx, "EGL version %d.%d\n", major, minor); EGLint context_attribs[] = { EGL_CONTEXT_MAJOR_VERSION_KHR, @@ -180,6 +181,8 @@ static bool config_window_wayland(struct MPGLContext *ctx, bool enable_alpha = !!(flags & VOFLAG_ALPHA); bool ret = false; + egl_ctx->log = mp_log_new(egl_ctx, wl->log, "EGL"); + if (!vo_wayland_config(ctx->vo, d_width, d_height, flags)) return false; -- cgit v1.2.3