5 files changed, 19 insertions, 35 deletions

diff --git a/backend/backend.c b/backend/backend.c
index 00d77cd2..13583bba 100644
--- a/backend/backend.c
+++ b/backend/backend.c
@@ -209,6 +209,21 @@ static size_t parse_outputs_env(const char *name) {
 	return outputs;
 }
 
+static struct wlr_backend *ensure_backend_renderer_and_allocator(
+		struct wlr_backend *backend) {
+	struct wlr_renderer *renderer = wlr_backend_get_renderer(backend);
+	if (renderer == NULL) {
+		wlr_backend_destroy(backend);
+		return NULL;
+	}
+	struct wlr_allocator *allocator = backend_get_allocator(backend);
+	if (allocator == NULL) {
+		wlr_backend_destroy(backend);
+		return NULL;
+	}
+	return backend;
+}
+
 static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
 	struct wlr_backend *backend = wlr_wl_backend_create(display, NULL);
 	if (backend == NULL) {
@@ -220,7 +235,7 @@ static struct wlr_backend *attempt_wl_backend(struct wl_display *display) {
 		wlr_wl_output_create(backend);
 	}
 
-	return backend;
+	return ensure_backend_renderer_and_allocator(backend);
 }
 
 #if WLR_HAS_X11_BACKEND
@@ -236,7 +251,7 @@ static struct wlr_backend *attempt_x11_backend(struct wl_display *display,
 		wlr_x11_output_create(backend);
 	}
 
-	return backend;
+	return ensure_backend_renderer_and_allocator(backend);
 }
 #endif
 
@@ -252,7 +267,7 @@ static struct wlr_backend *attempt_headless_backend(
 		wlr_headless_add_output(backend, 1280, 720);
 	}
 
-	return backend;
+	return ensure_backend_renderer_and_allocator(backend);
 }
 
 static struct wlr_backend *attempt_noop_backend(struct wl_display *display) {
@@ -297,7 +312,7 @@ static struct wlr_backend *attempt_drm_backend(struct wl_display *display,
 		wlr_multi_backend_add(backend, drm);
 	}
 
-	return primary_drm;
+	return ensure_backend_renderer_and_allocator(primary_drm);
 }
 #endif
 
diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index 52230592..9ae4dbf0 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -11,7 +11,6 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
-#include "backend/backend.h"
 #include "backend/drm/drm.h"
 #include "util/signal.h"
 
@@ -258,12 +257,6 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
 		}
 	}
 
-	struct wlr_renderer *renderer = wlr_backend_get_renderer(&drm->backend);
-	struct wlr_allocator *allocator = backend_get_allocator(&drm->backend);
-	if (renderer == NULL || allocator == NULL) {
-		goto error_mgpu_renderer;
-	}
-
 	drm->session_destroy.notify = handle_session_destroy;
 	wl_signal_add(&session->events.destroy, &drm->session_destroy);
 
diff --git a/backend/headless/backend.c b/backend/headless/backend.c
index 51217f8b..49c2c8ba 100644
--- a/backend/headless/backend.c
+++ b/backend/headless/backend.c
@@ -9,10 +9,8 @@
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/util/log.h>
 #include <xf86drm.h>
-#include "backend/backend.h"
 #include "backend/headless.h"
 #include "render/drm_format_set.h"
-#include "render/wlr_renderer.h"
 #include "util/signal.h"
 
 struct wlr_headless_backend *headless_backend_from_backend(
@@ -137,11 +135,6 @@ static bool backend_init(struct wlr_headless_backend *backend,
 		wl_signal_add(&renderer->events.destroy, &backend->parent_renderer_destroy);
 	}
 
-	if (backend_get_allocator(&backend->backend) == NULL) {
-		wlr_log(WLR_ERROR, "Failed to create allocator");
-		return false;
-	}
-
 	backend->display_destroy.notify = handle_display_destroy;
 	wl_display_add_destroy_listener(display, &backend->display_destroy);
 
diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c
index 6c34ff27..1ba62e67 100644
--- a/backend/wayland/backend.c
+++ b/backend/wayland/backend.c
@@ -15,11 +15,9 @@
 #include <wlr/interfaces/wlr_output.h>
 #include <wlr/util/log.h>
 
-#include "backend/backend.h"
 #include "backend/wayland.h"
 #include "render/drm_format_set.h"
 #include "render/pixel_format.h"
-#include "render/wlr_renderer.h"
 #include "util/signal.h"
 
 #include "drm-client-protocol.h"
@@ -444,19 +442,11 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display,
 		wl->drm_fd = -1;
 	}
 
-	struct wlr_renderer *renderer = wlr_backend_get_renderer(&wl->backend);
-	struct wlr_allocator *allocator = backend_get_allocator(&wl->backend);
-	if (renderer == NULL || allocator == NULL) {
-		goto error_drm_fd;
-	}
-
 	wl->local_display_destroy.notify = handle_display_destroy;
 	wl_display_add_destroy_listener(display, &wl->local_display_destroy);
 
 	return &wl->backend;
 
-error_drm_fd:
-	close(wl->drm_fd);
 error_remote_display_src:
 	wl_event_source_remove(wl->remote_display_src);
 error_registry:
diff --git a/backend/x11/backend.c b/backend/x11/backend.c
index f55238cb..9eaf5664 100644
--- a/backend/x11/backend.c
+++ b/backend/x11/backend.c
@@ -29,7 +29,6 @@
 #include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/util/log.h>
 
-#include "backend/backend.h"
 #include "backend/x11.h"
 #include "render/drm_format_set.h"
 #include "util/signal.h"
@@ -611,12 +610,6 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
 		}
 	}
 
-	struct wlr_renderer *renderer = wlr_backend_get_renderer(&x11->backend);
-	struct wlr_allocator *allocator = backend_get_allocator(&x11->backend);
-	if (renderer == NULL || allocator == NULL) {
-		goto error_event;
-	}
-
 	// Windows can only display buffers with the depth they were created with
 	// TODO: look into changing the window's depth at runtime
 	const struct wlr_drm_format *dri3_format =