diff options
| author | Rouven Czerwinski <rouven@czerwinskis.de> | 2019-08-07 08:11:38 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-08-07 16:22:11 +0900 |
| commit | 01f903874b7e27539488fad7f31476d5bcbc6ac9 (patch) | |
| tree | 7cef0bbf63501ed66d0fc2392f491dc3b47928a8 /backend/headless | |
| parent | 4d36cc86eb8d056f963b3b783d6e3f9bf36e96b6 (diff) | |
Revert "output: atomic mode"
This reverts commit ee5f98ad49fed0439f3313ec685307831d1d1d05.
This intoduced problems where outputs could not be turned off because
they had flips pending.
Diffstat (limited to 'backend/headless')
| -rw-r--r-- | backend/headless/output.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/backend/headless/output.c b/backend/headless/output.c index 1916b525..992a4883 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -58,26 +58,8 @@ static bool output_attach_render(struct wlr_output *wlr_output, } static bool output_commit(struct wlr_output *wlr_output) { - if (wlr_output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { - wlr_log(WLR_DEBUG, "Cannot disable a headless output"); - return false; - } - - if (wlr_output->pending.committed & WLR_OUTPUT_STATE_MODE) { - assert(wlr_output->pending.mode_type == WLR_OUTPUT_STATE_MODE_CUSTOM); - if (!output_set_custom_mode(wlr_output, - wlr_output->pending.custom_mode.width, - wlr_output->pending.custom_mode.height, - wlr_output->pending.custom_mode.refresh)) { - return false; - } - } - - if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { - // Nothing needs to be done for pbuffers - wlr_output_send_present(wlr_output, NULL); - } - + // Nothing needs to be done for pbuffers + wlr_output_send_present(wlr_output, NULL); return true; } @@ -94,6 +76,7 @@ static void output_destroy(struct wlr_output *wlr_output) { } static const struct wlr_output_impl output_impl = { + .set_custom_mode = output_set_custom_mode, .destroy = output_destroy, .attach_render = output_attach_render, .commit = output_commit, |