diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-02-13 08:30:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 08:30:54 -0500 |
| commit | 71cba94e73022d8cef8651055204a4706377ae11 (patch) | |
| tree | 8ea1a2b6a0414fd7904824ffac330cd4e1e96ca2 /include/backend/drm | |
| parent | 3497e53516d96ad67b26115e2e06218f68e1114d (diff) | |
| parent | c2e147401048aa53aebd52f1851b1da8c91043a3 (diff) | |
Merge pull request #627 from emersion/wlr-signal-emit-safe
Remove wlr_backend.events.{output_remove,device_remove}
Diffstat (limited to 'include/backend/drm')
| -rw-r--r-- | include/backend/drm/drm.h | 10 | ||||
| -rw-r--r-- | include/backend/drm/iface.h | 3 | ||||
| -rw-r--r-- | include/backend/drm/renderer.h | 6 | ||||
| -rw-r--r-- | include/backend/drm/util.h | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 12530da6..65db04ef 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -1,19 +1,17 @@ #ifndef BACKEND_DRM_DRM_H #define BACKEND_DRM_DRM_H +#include <EGL/egl.h> +#include <gbm.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> #include <wayland-server.h> -#include <xf86drmMode.h> -#include <EGL/egl.h> -#include <gbm.h> #include <wayland-util.h> - -#include <wlr/backend/session.h> #include <wlr/backend/drm.h> +#include <wlr/backend/session.h> #include <wlr/render/egl.h> - +#include <xf86drmMode.h> #include "iface.h" #include "properties.h" #include "renderer.h" diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 15cdf1ab..ef0e7bf8 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -1,10 +1,9 @@ #ifndef BACKEND_DRM_IFACE_H #define BACKEND_DRM_IFACE_H +#include <gbm.h> #include <stdbool.h> #include <stdint.h> - -#include <gbm.h> #include <xf86drm.h> #include <xf86drmMode.h> diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index bf0165bc..a56a8673 100644 --- a/include/backend/drm/renderer.h +++ b/include/backend/drm/renderer.h @@ -1,12 +1,10 @@ #ifndef BACKEND_DRM_RENDERER_H #define BACKEND_DRM_RENDERER_H -#include <stdbool.h> -#include <stdint.h> - #include <EGL/egl.h> #include <gbm.h> - +#include <stdbool.h> +#include <stdint.h> #include <wlr/render.h> struct wlr_drm_backend; diff --git a/include/backend/drm/util.h b/include/backend/drm/util.h index 6818b4db..25da858f 100644 --- a/include/backend/drm/util.h +++ b/include/backend/drm/util.h @@ -2,9 +2,9 @@ #define BACKEND_DRM_UTIL_H #include <stdint.h> +#include <wlr/types/wlr_output.h> #include <xf86drm.h> #include <xf86drmMode.h> -#include <wlr/types/wlr_output.h> // Calculates a more accurate refresh rate (mHz) than what mode itself provides int32_t calculate_refresh_rate(drmModeModeInfo *mode); |