diff options
| author | emersion <contact@emersion.fr> | 2018-08-13 14:43:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 14:43:57 +0100 |
| commit | 1a73baac94a18e55be3a22aab4ca8fee35225941 (patch) | |
| tree | 76eb246a832dd11d235327d1c9c67ea7560b7c75 | |
| parent | 4ed6ee0a4d112711c3764b9b5d0d44ec916fb48a (diff) | |
| parent | 4486b52aa8e5e5273a779908ad8e823fa1bd2812 (diff) | |
Merge pull request #1187 from ammen99/master
move wlr_drm_connector_add_mode to wlr/backend/drm.h
| -rw-r--r-- | include/backend/drm/drm.h | 4 | ||||
| -rw-r--r-- | include/wlr/backend/drm.h | 6 | ||||
| -rw-r--r-- | rootston/output.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 416507ea..5d6ff231 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -143,9 +143,5 @@ void restore_drm_outputs(struct wlr_drm_backend *drm); void scan_drm_connectors(struct wlr_drm_backend *state); int handle_drm_event(int fd, uint32_t mask, void *data); void enable_drm_connector(struct wlr_output *output, bool enable); -/** - * Add mode to the list of available modes - */ -bool wlr_drm_connector_add_mode(struct wlr_output *output, const drmModeModeInfo *mode); #endif diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index a8a5525e..5d47647d 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -28,6 +28,12 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, bool wlr_backend_is_drm(struct wlr_backend *backend); bool wlr_output_is_drm(struct wlr_output *output); +/** + * Add mode to the list of available modes + */ +typedef struct _drmModeModeInfo drmModeModeInfo; +bool wlr_drm_connector_add_mode(struct wlr_output *output, const drmModeModeInfo *mode); + struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend); #endif diff --git a/rootston/output.c b/rootston/output.c index 71ccf8bc..d8edf1c2 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -3,6 +3,7 @@ #include <stdbool.h> #include <stdlib.h> #include <time.h> +#include <wlr/backend/drm.h> #include <wlr/config.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_compositor.h> @@ -16,7 +17,6 @@ #include "rootston/layers.h" #include "rootston/output.h" #include "rootston/server.h" -#include "backend/drm/drm.h" /** * Rotate a child's position relative to a parent. The parent size is (pw, ph), |