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

2 files changed, 2 insertions, 5 deletions

diff --git a/rootston/desktop.c b/rootston/desktop.c
index 5fd4a5cc..d3654661 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -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(
diff --git a/rootston/main.c b/rootston/main.c
index a327576a..3273c53f 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -8,7 +8,6 @@
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
 #include <wlr/render.h>
-#include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
 #include "rootston/config.h"
 #include "rootston/server.h"
@@ -34,13 +33,12 @@ int main(int argc, char **argv) {
 	assert(server.wl_event_loop = wl_display_get_event_loop(server.wl_display));
 
 	server.backend = wlr_backend_autocreate(server.wl_display);
-
 	if (server.backend == NULL) {
 		wlr_log(L_ERROR, "could not start backend");
 		return 1;
 	}
 
-	assert(server.renderer = wlr_gles2_renderer_create(server.backend));
+	assert(server.renderer = wlr_backend_get_renderer(server.backend));
 	server.data_device_manager =
 		wlr_data_device_manager_create(server.wl_display);
 	wl_display_init_shm(server.wl_display);