From 2f0815838d921f3fc4a22cb45985fd7d35db5d95 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Sat, 1 Sep 2018 19:27:18 +0200
Subject: [PATCH] Init dmabuf global in renderer

---
 include/rootston/desktop.h | 2 --
 render/wlr_renderer.c      | 7 ++++++-
 rootston/desktop.c         | 4 ----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 363a16f0..3496fb43 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -10,7 +10,6 @@
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
-#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_list.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output.h>
@@ -53,7 +52,6 @@ struct roots_desktop {
 	struct wlr_idle *idle;
 	struct wlr_idle_inhibit_manager_v1 *idle_inhibit;
 	struct wlr_input_inhibit_manager *input_inhibit;
-	struct wlr_linux_dmabuf_v1 *linux_dmabuf;
 	struct wlr_layer_shell *layer_shell;
 	struct wlr_virtual_keyboard_manager_v1 *virtual_keyboard;
 	struct wlr_screencopy_manager_v1 *screencopy;
diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c
index 6c2b9fbb..31bf2b18 100644
--- a/render/wlr_renderer.c
+++ b/render/wlr_renderer.c
@@ -1,10 +1,11 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <wlr/render/gles2.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/wlr_renderer.h>
+#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_matrix.h>
-#include <wlr/render/gles2.h>
 #include <wlr/util/log.h>
 #include "util/signal.h"
 
@@ -176,6 +177,10 @@ void wlr_renderer_init_wl_display(struct wlr_renderer *r,
 		}
 	}
 
+	if (r->impl->texture_from_dmabuf) {
+		wlr_linux_dmabuf_v1_create(wl_display, r);
+	}
+
 	if (r->impl->init_wl_display) {
 		r->impl->init_wl_display(r, wl_display);
 	}
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 658611e3..efb7581a 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -14,7 +14,6 @@
 #include <wlr/types/wlr_idle.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_layer_shell.h>
-#include <wlr/types/wlr_linux_dmabuf_v1.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_server_decoration.h>
@@ -893,9 +892,6 @@ struct roots_desktop *desktop_create(struct roots_server *server,
 	wl_signal_add(&desktop->input_inhibit->events.deactivate,
 			&desktop->input_inhibit_deactivate);
 
-	desktop->linux_dmabuf = wlr_linux_dmabuf_v1_create(server->wl_display,
-		server->renderer);
-
 	desktop->virtual_keyboard = wlr_virtual_keyboard_manager_v1_create(
 		server->wl_display);
 	wl_signal_add(&desktop->virtual_keyboard->events.new_virtual_keyboard,