From 5503601273e43d98506bb33a29811fbe8729d4b8 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Fri, 4 May 2018 20:59:05 +0100
Subject: [PATCH] Update for wlroots multi renderer

---
 sway/desktop/output.c | 11 +++++++++--
 sway/server.c         |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 03af4239a..dd227faf4 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -4,6 +4,7 @@
 #include <strings.h>
 #include <time.h>
 #include <wayland-server.h>
+#include <wlr/render/multi.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_box.h>
 #include <wlr/types/wlr_matrix.h>
@@ -191,6 +192,13 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
 		return;
 	}
 
+	struct wlr_texture *texture =
+		wlr_multi_texture_get_child(surface->texture, renderer);
+	if (!sway_assert(texture != NULL,
+			"expected the texture to be uploaded to the output renderer")) {
+		return;
+	}
+
 	scale_box(&box, wlr_output->scale);
 
 	float matrix[9];
@@ -199,8 +207,7 @@ static void render_surface_iterator(struct wlr_surface *surface, int sx, int sy,
 	wlr_matrix_project_box(matrix, &box, transform, rotation,
 		wlr_output->transform_matrix);
 
-	wlr_render_texture_with_matrix(renderer, surface->texture,
-		matrix, alpha);
+	wlr_render_texture_with_matrix(renderer, texture, matrix, alpha);
 }
 
 static void render_layer(struct sway_output *output,
diff --git a/sway/server.c b/sway/server.c
index f67f44d85..40ea56dac 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -51,7 +51,7 @@ bool server_init(struct sway_server *server) {
 	struct wlr_renderer *renderer = wlr_backend_get_renderer(server->backend);
 	assert(renderer);
 
-	wlr_renderer_init_wl_shm(renderer, server->wl_display);
+	wlr_renderer_init_wl_display(renderer, server->wl_display);
 
 	server->compositor = wlr_compositor_create(server->wl_display, renderer);
 	server->data_device_manager =