aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2019-12-01 12:45:06 +0100
committerDrew DeVault <sir@cmpwn.com>2019-12-01 10:25:34 -0500
commitdc6ef658b6fc448fa5fbe66897896a32a7fce8a3 (patch)
tree873bffc731d2336f5611a73376d8dbf376cd96a2
parentce5040a5a137e62be639420b87bb93da468dc0a9 (diff)
Revert "output: add block_idle_frame"
This reverts commit cbb2781fed7944dae680a66a35443f5b1a678ec7. In [1], we found issues with block_idle_frame and replaced it with frame_pending. block_idle_frame is now unused. [1]: https://github.com/swaywm/sway/pull/4772
-rw-r--r--include/wlr/types/wlr_output.h2
-rw-r--r--types/wlr_output.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index e9aab373..b8087ebd 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -148,8 +148,6 @@ struct wlr_output {
struct wl_listener display_destroy;
void *data;
-
- bool block_idle_frame;
};
struct wlr_output_event_precommit {
diff --git a/types/wlr_output.c b/types/wlr_output.c
index bf29ff9c..22d9c588 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -544,8 +544,7 @@ void wlr_output_send_frame(struct wlr_output *output) {
static void schedule_frame_handle_idle_timer(void *data) {
struct wlr_output *output = data;
output->idle_frame = NULL;
- if (!output->frame_pending && output->impl->schedule_frame
- && !output->block_idle_frame) {
+ if (!output->frame_pending && output->impl->schedule_frame) {
// Ask the backend to send a frame event when appropriate
if (output->impl->schedule_frame(output)) {
output->frame_pending = true;