diff options
author | emersion <contact@emersion.fr> | 2018-03-30 00:47:57 -0400 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2018-03-30 00:49:27 -0400 |
commit | 981827ca423838a0fa422b4dd65acb1b8f81349d (patch) | |
tree | 6692bd2c5c8978b8f2d4893b3a9bb38b916d361b /sway/server.c | |
parent | Fix crash when override redirect views close (diff) | |
download | sway-981827ca423838a0fa422b4dd65acb1b8f81349d.tar.gz sway-981827ca423838a0fa422b4dd65acb1b8f81349d.tar.zst sway-981827ca423838a0fa422b4dd65acb1b8f81349d.zip |
Cleanup and remove global renderer reference
Diffstat (limited to 'sway/server.c')
-rw-r--r-- | sway/server.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sway/server.c b/sway/server.c index 3fba019d..728e624e 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -1,19 +1,19 @@ | |||
1 | #define _POSIX_C_SOURCE 200112L | 1 | #define _POSIX_C_SOURCE 200112L |
2 | #include <stdlib.h> | 2 | #include <assert.h> |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <stdlib.h> | ||
4 | #include <wayland-server.h> | 5 | #include <wayland-server.h> |
5 | #include <wlr/backend.h> | 6 | #include <wlr/backend.h> |
6 | #include <wlr/backend/session.h> | 7 | #include <wlr/backend/session.h> |
7 | #include <wlr/render/wlr_renderer.h> | 8 | #include <wlr/render/wlr_renderer.h> |
8 | #include <wlr/render/gles2.h> | ||
9 | #include <wlr/types/wlr_compositor.h> | 9 | #include <wlr/types/wlr_compositor.h> |
10 | #include <wlr/types/wlr_gamma_control.h> | ||
10 | #include <wlr/types/wlr_layer_shell.h> | 11 | #include <wlr/types/wlr_layer_shell.h> |
11 | #include <wlr/types/wlr_screenshooter.h> | 12 | #include <wlr/types/wlr_screenshooter.h> |
12 | #include <wlr/types/wlr_gamma_control.h> | ||
13 | #include <wlr/types/wlr_wl_shell.h> | 13 | #include <wlr/types/wlr_wl_shell.h> |
14 | #include <wlr/util/log.h> | ||
14 | // TODO WLR: make Xwayland optional | 15 | // TODO WLR: make Xwayland optional |
15 | #include <wlr/xwayland.h> | 16 | #include <wlr/xwayland.h> |
16 | #include <wlr/util/log.h> | ||
17 | #include "sway/commands.h" | 17 | #include "sway/commands.h" |
18 | #include "sway/config.h" | 18 | #include "sway/config.h" |
19 | #include "sway/server.h" | 19 | #include "sway/server.h" |
@@ -42,11 +42,12 @@ bool server_init(struct sway_server *server) { | |||
42 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); | 42 | server->wl_event_loop = wl_display_get_event_loop(server->wl_display); |
43 | server->backend = wlr_backend_autocreate(server->wl_display); | 43 | server->backend = wlr_backend_autocreate(server->wl_display); |
44 | 44 | ||
45 | server->renderer = wlr_gles2_renderer_create(server->backend); | 45 | struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend); |
46 | assert(renderer); | ||
47 | |||
46 | wl_display_init_shm(server->wl_display); | 48 | wl_display_init_shm(server->wl_display); |
47 | 49 | ||
48 | server->compositor = wlr_compositor_create( | 50 | server->compositor = wlr_compositor_create(server->wl_display, renderer); |
49 | server->wl_display, server->renderer); | ||
50 | server->data_device_manager = | 51 | server->data_device_manager = |
51 | wlr_data_device_manager_create(server->wl_display); | 52 | wlr_data_device_manager_create(server->wl_display); |
52 | 53 | ||
@@ -95,8 +96,7 @@ bool server_init(struct sway_server *server) { | |||
95 | } | 96 | } |
96 | 97 | ||
97 | void server_fini(struct sway_server *server) { | 98 | void server_fini(struct sway_server *server) { |
98 | // TODO WLR: tear down more stuff | 99 | // TODO |
99 | wlr_backend_destroy(server->backend); | ||
100 | } | 100 | } |
101 | 101 | ||
102 | void server_run(struct sway_server *server) { | 102 | void server_run(struct sway_server *server) { |