diff options
| author | Simon Ser <contact@emersion.fr> | 2020-05-14 18:27:02 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-05-14 20:09:28 +0200 |
| commit | 347bdb6d9a8064e32adbfac5413c9c81fc49109b (patch) | |
| tree | a307e40c62d24752b8e6cea06d781367cb048c9c /include/backend | |
| parent | 7693fdb8a78d00e25d59f6399e89ba0e98670493 (diff) | |
output: make wlr_output_set_gamma atomic
wlr_output_set_gamma is now double-buffered and applies the gamma LUT on
the next output commit.
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm/drm.h | 13 | ||||
| -rw-r--r-- | include/backend/drm/iface.h | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index d2b3fe3d..4993fe18 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -44,7 +44,6 @@ struct wlr_drm_plane { enum wlr_drm_crtc_field { WLR_DRM_CRTC_MODE = 1 << 0, - WLR_DRM_CRTC_GAMMA_LUT = 1 << 1, }; struct wlr_drm_crtc { @@ -72,9 +71,6 @@ struct wlr_drm_crtc { uint32_t *overlays; union wlr_drm_crtc_props props; - - uint16_t *gamma_table; - size_t gamma_table_size; }; struct wlr_drm_backend { @@ -156,16 +152,11 @@ 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); bool enable_drm_connector(struct wlr_output *output, bool enable); -bool set_drm_connector_gamma(struct wlr_output *output, size_t size, - const uint16_t *r, const uint16_t *g, const uint16_t *b); bool drm_connector_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); +size_t drm_crtc_get_gamma_lut_size(struct wlr_drm_backend *drm, + struct wlr_drm_crtc *crtc); struct wlr_drm_fb *plane_get_next_fb(struct wlr_drm_plane *plane); -bool legacy_crtc_set_cursor(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc, struct gbm_bo *bo); -bool legacy_crtc_move_cursor(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc, int x, int y); - #endif diff --git a/include/backend/drm/iface.h b/include/backend/drm/iface.h index 9377af03..ae84bafe 100644 --- a/include/backend/drm/iface.h +++ b/include/backend/drm/iface.h @@ -22,6 +22,6 @@ extern const struct wlr_drm_interface atomic_iface; extern const struct wlr_drm_interface legacy_iface; bool drm_legacy_crtc_set_gamma(struct wlr_drm_backend *drm, - struct wlr_drm_crtc *crtc); + struct wlr_drm_crtc *crtc, size_t size, uint16_t *lut); #endif |