summaryrefslogtreecommitdiffstats
path: root/video/out/wayland_common.h
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-08-19 14:07:17 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-08-19 14:12:39 +0200
commit7cec294d088d80f293e44218c748cf61db4f0879 (patch)
tree687b525276c9cf832c4867606cd2b4ec34a9e172 /video/out/wayland_common.h
parentc5e66dde334c6ec5ea08418e58e0a35d0e58dd1f (diff)
downloadmpv-7cec294d088d80f293e44218c748cf61db4f0879.tar.bz2
mpv-7cec294d088d80f293e44218c748cf61db4f0879.tar.xz
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).
Diffstat (limited to 'video/out/wayland_common.h')
-rw-r--r--video/out/wayland_common.h4
1 files changed, 2 insertions, 2 deletions
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;