diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-19 14:18:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-19 14:18:13 -0700 |
commit | d28c4c00941b9140deb22a091f0e70cbf2a49325 (patch) | |
tree | a81ef9a4d873de4a886ee414872b496838a61160 | |
parent | Merge pull request #2310 from RyanDwyer/assign-output (diff) | |
parent | Merge branch 'master' into update-wlroots-1148 (diff) | |
download | sway-d28c4c00941b9140deb22a091f0e70cbf2a49325.tar.gz sway-d28c4c00941b9140deb22a091f0e70cbf2a49325.tar.zst sway-d28c4c00941b9140deb22a091f0e70cbf2a49325.zip |
Merge pull request #2314 from emersion/update-wlroots-1148
Update for swaywm/wlroots#1148
-rw-r--r-- | sway/desktop/transaction.c | 1 | ||||
-rw-r--r-- | sway/server.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index fcfb0b51..19f41efc 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c | |||
@@ -4,7 +4,6 @@ | |||
4 | #include <string.h> | 4 | #include <string.h> |
5 | #include <time.h> | 5 | #include <time.h> |
6 | #include <wlr/types/wlr_buffer.h> | 6 | #include <wlr/types/wlr_buffer.h> |
7 | #include <wlr/types/wlr_linux_dmabuf.h> | ||
8 | #include "sway/debug.h" | 7 | #include "sway/debug.h" |
9 | #include "sway/desktop/idle_inhibit_v1.h" | 8 | #include "sway/desktop/idle_inhibit_v1.h" |
10 | #include "sway/desktop/transaction.h" | 9 | #include "sway/desktop/transaction.h" |
diff --git a/sway/server.c b/sway/server.c index ee71d538..89dfbf8c 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <wlr/types/wlr_gamma_control.h> | 11 | #include <wlr/types/wlr_gamma_control.h> |
12 | #include <wlr/types/wlr_idle.h> | 12 | #include <wlr/types/wlr_idle.h> |
13 | #include <wlr/types/wlr_layer_shell.h> | 13 | #include <wlr/types/wlr_layer_shell.h> |
14 | #include <wlr/types/wlr_linux_dmabuf.h> | 14 | #include <wlr/types/wlr_linux_dmabuf_v1.h> |
15 | #include <wlr/types/wlr_primary_selection.h> | 15 | #include <wlr/types/wlr_primary_selection.h> |
16 | #include <wlr/types/wlr_screencopy_v1.h> | 16 | #include <wlr/types/wlr_screencopy_v1.h> |
17 | #include <wlr/types/wlr_server_decoration.h> | 17 | #include <wlr/types/wlr_server_decoration.h> |
@@ -108,7 +108,7 @@ bool server_init(struct sway_server *server) { | |||
108 | wlr_server_decoration_manager_set_default_mode( | 108 | wlr_server_decoration_manager_set_default_mode( |
109 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); | 109 | deco_manager, WLR_SERVER_DECORATION_MANAGER_MODE_SERVER); |
110 | 110 | ||
111 | wlr_linux_dmabuf_create(server->wl_display, renderer); | 111 | wlr_linux_dmabuf_v1_create(server->wl_display, renderer); |
112 | wlr_export_dmabuf_manager_v1_create(server->wl_display); | 112 | wlr_export_dmabuf_manager_v1_create(server->wl_display); |
113 | wlr_screencopy_manager_v1_create(server->wl_display); | 113 | wlr_screencopy_manager_v1_create(server->wl_display); |
114 | 114 | ||