diff options
| author | Simon Ser <contact@emersion.fr> | 2019-04-09 23:36:35 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-06-07 09:06:11 -0400 |
| commit | e516ea4c798d4c02e77836d5e8196decb90a8774 (patch) | |
| tree | 3fa5a19fdf2b79084a4c02a393794efe1ca0635e /include/backend | |
| parent | 96d6fde5dc7ed2e9897297ed459246cb4133a30f (diff) | |
backend/drm: check format when scanning out DMA-BUF
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm/drm.h | 2 | ||||
| -rw-r--r-- | include/backend/drm/properties.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 6481f085..ba08449a 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -11,6 +11,7 @@ #include <wayland-util.h> #include <wlr/backend/drm.h> #include <wlr/backend/session.h> +#include <wlr/render/drm_format_set.h> #include <wlr/render/egl.h> #include <xf86drmMode.h> #include "iface.h" @@ -27,6 +28,7 @@ struct wlr_drm_plane { struct wlr_drm_surface mgpu_surf; uint32_t drm_format; // ARGB8888 or XRGB8888 + struct wlr_drm_format_set formats; // Only used by cursor float matrix[9]; diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h index b4d43bdd..28f0dbe4 100644 --- a/include/backend/drm/properties.h +++ b/include/backend/drm/properties.h @@ -44,6 +44,7 @@ union wlr_drm_plane_props { struct { uint32_t type; uint32_t rotation; // Not guaranteed to exist + uint32_t in_formats; // Not guaranteed to exist // atomic-modesetting only @@ -58,7 +59,7 @@ union wlr_drm_plane_props { uint32_t fb_id; uint32_t crtc_id; }; - uint32_t props[12]; + uint32_t props[13]; }; bool get_drm_connector_props(int fd, uint32_t id, |