From 01f903874b7e27539488fad7f31476d5bcbc6ac9 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Wed, 7 Aug 2019 08:11:38 +0200 Subject: Revert "output: atomic mode" This reverts commit ee5f98ad49fed0439f3313ec685307831d1d1d05. This intoduced problems where outputs could not be turned off because they had flips pending. --- include/wlr/interfaces/wlr_output.h | 4 ++++ include/wlr/types/wlr_output.h | 48 +++++-------------------------------- 2 files changed, 10 insertions(+), 42 deletions(-) (limited to 'include') diff --git a/include/wlr/interfaces/wlr_output.h b/include/wlr/interfaces/wlr_output.h index 8d4a3fd8..a9a89c34 100644 --- a/include/wlr/interfaces/wlr_output.h +++ b/include/wlr/interfaces/wlr_output.h @@ -15,6 +15,10 @@ #include struct wlr_output_impl { + bool (*enable)(struct wlr_output *output, bool enable); + bool (*set_mode)(struct wlr_output *output, struct wlr_output_mode *mode); + bool (*set_custom_mode)(struct wlr_output *output, int32_t width, + int32_t height, int32_t refresh); bool (*set_cursor)(struct wlr_output *output, struct wlr_texture *texture, int32_t scale, enum wl_output_transform transform, int32_t hotspot_x, int32_t hotspot_y, bool update_texture); diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h index be04ec3b..281f7daf 100644 --- a/include/wlr/types/wlr_output.h +++ b/include/wlr/types/wlr_output.h @@ -49,10 +49,6 @@ struct wlr_output_cursor { enum wlr_output_state_field { WLR_OUTPUT_STATE_BUFFER = 1 << 0, WLR_OUTPUT_STATE_DAMAGE = 1 << 1, - WLR_OUTPUT_STATE_MODE = 1 << 2, - WLR_OUTPUT_STATE_ENABLED = 1 << 3, - WLR_OUTPUT_STATE_SCALE = 1 << 4, - WLR_OUTPUT_STATE_TRANSFORM = 1 << 5, }; enum wlr_output_state_buffer_type { @@ -60,32 +56,16 @@ enum wlr_output_state_buffer_type { WLR_OUTPUT_STATE_BUFFER_SCANOUT, }; -enum wlr_output_state_mode_type { - WLR_OUTPUT_STATE_MODE_FIXED, - WLR_OUTPUT_STATE_MODE_CUSTOM, -}; - /** * Holds the double-buffered output state. */ struct wlr_output_state { uint32_t committed; // enum wlr_output_state_field pixman_region32_t damage; // output-buffer-local coordinates - bool enabled; - float scale; - enum wl_output_transform transform; // only valid if WLR_OUTPUT_STATE_BUFFER enum wlr_output_state_buffer_type buffer_type; struct wlr_buffer *buffer; // if WLR_OUTPUT_STATE_BUFFER_SCANOUT - - // only valid if WLR_OUTPUT_STATE_MODE - enum wlr_output_state_mode_type mode_type; - struct wlr_output_mode *mode; - struct { - int32_t width, height; - int32_t refresh; // mHz, may be zero - } custom_mode; }; struct wlr_output_impl; @@ -203,11 +183,8 @@ struct wlr_surface; /** * Enables or disables the output. A disabled output is turned off and doesn't * emit `frame` events. - * - * Whether an output is enabled is double-buffered state, see - * `wlr_output_commit`. */ -void wlr_output_enable(struct wlr_output *output, bool enable); +bool wlr_output_enable(struct wlr_output *output, bool enable); void wlr_output_create_global(struct wlr_output *output); void wlr_output_destroy_global(struct wlr_output *output); /** @@ -217,31 +194,17 @@ void wlr_output_destroy_global(struct wlr_output *output); struct wlr_output_mode *wlr_output_preferred_mode(struct wlr_output *output); /** * Sets the output mode. Enables the output if it's currently disabled. - * - * Mode is double-buffered state, see `wlr_output_commit`. */ -void wlr_output_set_mode(struct wlr_output *output, +bool wlr_output_set_mode(struct wlr_output *output, struct wlr_output_mode *mode); /** * Sets a custom mode on the output. If modes are available, they are preferred. * Setting `refresh` to zero lets the backend pick a preferred value. - * - * Custom mode is double-buffered state, see `wlr_output_commit`. */ -void wlr_output_set_custom_mode(struct wlr_output *output, int32_t width, +bool wlr_output_set_custom_mode(struct wlr_output *output, int32_t width, int32_t height, int32_t refresh); -/** - * Sets a transform for the output. - * - * Transform is double-buffered state, see `wlr_output_commit`. - */ void wlr_output_set_transform(struct wlr_output *output, enum wl_output_transform transform); -/** - * Sets a scale for the output. - * - * Scale is double-buffered state, see `wlr_output_commit`. - */ void wlr_output_set_scale(struct wlr_output *output, float scale); void wlr_output_set_subpixel(struct wlr_output *output, enum wl_output_subpixel subpixel); @@ -299,8 +262,9 @@ void wlr_output_set_damage(struct wlr_output *output, pixman_region32_t *damage); /** * Commit the pending output state. If `wlr_output_attach_render` has been - * called, the pending frame will be submitted for display and a `frame` event - * will be scheduled. + * called, the pending frame will be submitted for display. + * + * This function schedules a `frame` event. */ bool wlr_output_commit(struct wlr_output *output); /** -- cgit v1.2.3