From 15b1ce9e6ced22a90ab0df7a6b86c6d35c40ca93 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sun, 7 May 2017 10:00:23 -0400
Subject: Refactor backend state management
---
include/backend/drm/backend.h | 10 +++-------
include/backend/drm/drm.h | 3 ++-
2 files changed, 5 insertions(+), 8 deletions(-)
(limited to 'include/backend')
diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h
index bdda7ea7..0c725ccb 100644
--- a/include/backend/drm/backend.h
+++ b/include/backend/drm/backend.h
@@ -12,21 +12,17 @@
#include <wlr/common/list.h>
#include <wlr/backend/drm.h>
+#include "backend.h"
#include "udev.h"
#include "event.h"
#include "drm.h"
-struct wlr_drm_backend {
+struct wlr_backend_state {
int fd;
+ struct wlr_backend *backend;
struct wl_event_source *drm_event;
- struct {
- struct wl_signal output_add;
- struct wl_signal output_rem;
- struct wl_signal output_render;
- } signals;
-
uint32_t taken_crtcs;
list_t *outputs;
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 51b0cdc6..3e83058a 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -8,6 +8,7 @@
#include <gbm.h>
#include "backend/egl.h"
+#include "backend.h"
struct wlr_drm_renderer {
int fd;
@@ -50,7 +51,7 @@ struct wlr_drm_output {
void wlr_drm_output_cleanup(struct wlr_drm_output *out, bool restore);
-void wlr_drm_scan_connectors(struct wlr_drm_backend *backend);
+void wlr_drm_scan_connectors(struct wlr_backend_state *state);
int wlr_drm_event(int fd, uint32_t mask, void *data);
#endif
--
cgit v1.2.3