Merge remote-tracking branch 'upstream/master' into output-damage

This commit is contained in:
emersion 2018-01-29 23:24:09 +01:00
commit 51c22d39a4
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
22 changed files with 187 additions and 98 deletions

View file

@ -689,8 +689,7 @@ struct roots_desktop *desktop_create(struct roots_server *server,
desktop->gamma_control_manager = wlr_gamma_control_manager_create(
server->wl_display);
desktop->screenshooter = wlr_screenshooter_create(server->wl_display,
server->renderer);
desktop->screenshooter = wlr_screenshooter_create(server->wl_display);
desktop->server_decoration_manager =
wlr_server_decoration_manager_create(server->wl_display);
wlr_server_decoration_manager_set_default_mode(