From 7cec294d088d80f293e44218c748cf61db4f0879 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Mon, 19 Aug 2013 14:07:17 +0200 Subject: wayland: separate shm and cursor context The display, window, keyboard and cursor structures are now cleanly and logically separated. Also could prevent a future bug where no shm format is set when the cursor image is loaded (Never happened until now). --- video/out/wayland_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'video/out/wayland_common.h') diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index 27dc057043..bb26f756a2 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -58,7 +58,8 @@ struct vo_wayland_state { int display_fd; - uint32_t formats; + struct wl_shm *shm; + uint32_t shm_formats; } display; struct { @@ -85,7 +86,6 @@ struct vo_wayland_state { } window; struct { - struct wl_shm *shm; struct wl_cursor *default_cursor; struct wl_cursor_theme *theme; struct wl_surface *surface; -- cgit v1.2.3