diff options
author | sghctoma <sghctoma@gmail.com> | 2018-09-03 08:57:17 +0200 |
---|---|---|
committer | sghctoma <sghctoma@gmail.com> | 2018-09-03 08:57:17 +0200 |
commit | df730a88919b078093dbc322926ada219a60d036 (patch) | |
tree | f2837f24092c7be5dfccdf448e47062cb5718549 /sway/server.c | |
parent | Enable privilege dropping of FreeBSD (diff) | |
parent | Merge pull request #2553 from emersion/disabled-no-modeset (diff) | |
download | sway-df730a88919b078093dbc322926ada219a60d036.tar.gz sway-df730a88919b078093dbc322926ada219a60d036.tar.zst sway-df730a88919b078093dbc322926ada219a60d036.zip |
Merge remote-tracking branch 'upstream/master' into fix-freebsd-build
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sway/server.c b/sway/server.c index 92ed5595..749365cb 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <wlr/types/wlr_gamma_control_v1.h> | 12 | #include <wlr/types/wlr_gamma_control_v1.h> |
13 | #include <wlr/types/wlr_idle.h> | 13 | #include <wlr/types/wlr_idle.h> |
14 | #include <wlr/types/wlr_layer_shell.h> | 14 | #include <wlr/types/wlr_layer_shell.h> |
15 | #include <wlr/types/wlr_linux_dmabuf_v1.h> | ||
16 | #include <wlr/types/wlr_primary_selection.h> | 15 | #include <wlr/types/wlr_primary_selection.h> |
17 | #include <wlr/types/wlr_screencopy_v1.h> | 16 | #include <wlr/types/wlr_screencopy_v1.h> |
18 | #include <wlr/types/wlr_server_decoration.h> | 17 | #include <wlr/types/wlr_server_decoration.h> |
@@ -117,7 +116,6 @@ bool server_init(struct sway_server *server) { | |||
117 | server->server_decoration.notify = handle_server_decoration; | 116 | server->server_decoration.notify = handle_server_decoration; |
118 | wl_list_init(&server->decorations); | 117 | wl_list_init(&server->decorations); |
119 | 118 | ||
120 | wlr_linux_dmabuf_v1_create(server->wl_display, renderer); | ||
121 | wlr_export_dmabuf_manager_v1_create(server->wl_display); | 119 | wlr_export_dmabuf_manager_v1_create(server->wl_display); |
122 | wlr_screencopy_manager_v1_create(server->wl_display); | 120 | wlr_screencopy_manager_v1_create(server->wl_display); |
123 | 121 | ||