diff options
Diffstat (limited to 'video')
-rw-r--r-- | video/out/gl_wayland.c | 13 | ||||
-rw-r--r-- | video/out/wayland_common.c | 17 | ||||
-rw-r--r-- | video/out/wayland_common.h | 1 |
3 files changed, 18 insertions, 13 deletions
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; diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index c0e79524f7..89cd698b30 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -218,13 +218,13 @@ static void keyboard_handle_keymap(void *data, close(fd); if (!wl->input.xkb.keymap) { - MP_ERR(wl->vo, "failed to compile keymap\n"); + MP_ERR(wl, "failed to compile keymap\n"); return; } wl->input.xkb.state = xkb_state_new(wl->input.xkb.keymap); if (!wl->input.xkb.state) { - MP_ERR(wl->vo, "failed to create XKB state\n"); + MP_ERR(wl, "failed to create XKB state\n"); xkb_map_unref(wl->input.xkb.keymap); wl->input.xkb.keymap = NULL; return; @@ -629,7 +629,7 @@ static bool create_window (struct vo_wayland_state *wl) wl->window.surface); if (!wl->window.shell_surface) { - MP_ERR(wl->vo, "creating shell surface failed\n"); + MP_ERR(wl, "creating shell surface failed\n"); return false; } @@ -681,7 +681,7 @@ static bool create_input (struct vo_wayland_state *wl) wl->input.xkb.context = xkb_context_new(0); if (!wl->input.xkb.context) { - MP_ERR(wl->vo, "failed to initialize input: check xkbcommon\n"); + MP_ERR(wl, "failed to initialize input: check xkbcommon\n"); return false; } @@ -712,6 +712,7 @@ int vo_wayland_init (struct vo *vo) vo->wayland = talloc_zero(NULL, struct vo_wayland_state); struct vo_wayland_state *wl = vo->wayland; wl->vo = vo; + wl->log = mp_log_new(wl, vo->log, "wayland"); if (!create_input(wl) || !create_display(wl) @@ -767,7 +768,7 @@ static void vo_wayland_fullscreen (struct vo *vo) struct wl_output *fs_output = wl->display.fs_output; if (vo->opts->fullscreen) { - MP_VERBOSE(wl->vo, "going fullscreen\n"); + MP_VERBOSE(wl, "going fullscreen\n"); wl->window.p_width = wl->window.width; wl->window.p_height = wl->window.height; wl_shell_surface_set_fullscreen(wl->window.shell_surface, @@ -776,7 +777,7 @@ static void vo_wayland_fullscreen (struct vo *vo) } else { - MP_VERBOSE(wl->vo, "leaving fullscreen\n"); + MP_VERBOSE(wl, "leaving fullscreen\n"); wl_shell_surface_set_toplevel(wl->window.shell_surface); shedule_resize(wl, 0, wl->window.p_width, wl->window.p_height); } @@ -803,7 +804,7 @@ static int vo_wayland_check_events (struct vo *vo) * are events to read from the file descriptor through poll */ if (poll(&fd, 1, 0) > 0) { if (fd.revents & POLLERR || fd.revents & POLLHUP) - MP_ERR(wl->vo, "error occurred on the display fd\n"); + MP_ERR(wl, "error occurred on the display fd\n"); if (fd.revents & POLLIN) wl_display_dispatch(dp); if (fd.revents & POLLOUT) @@ -846,7 +847,7 @@ static void vo_wayland_update_screeninfo (struct vo *vo) } if (!mode_received) { - MP_ERR(wl->vo, "no output mode detected\n"); + MP_ERR(wl, "no output mode detected\n"); return; } diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index dbe6e155f2..71f4a7481a 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -41,6 +41,7 @@ struct vo_wayland_output { struct vo_wayland_state { struct vo *vo; + struct mp_log* log; struct { int fd; |