alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Drop sway_output.surface_needs_frame

Browse source 
wlr_output_schedule_frame now sets output->needs_frame [1], so this
isn't needed anymore.

[1]: https://github.com/swaywm/wlroots/pull/2053
This commit is contained in:
Simon Ser 2020-03-05 13:53:29 +01:00 committed by Drew DeVault
parent f5ba8006c9
commit 241684eb1d
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/output.h
View file

@ -57,7 +57,6 @@ struct sway_output {
uint32_t refresh_nsec; uint32_t refresh_nsec;
int max_render_time; // In milliseconds int max_render_time; // In milliseconds
struct wl_event_source *repaint_timer; struct wl_event_source *repaint_timer;
bool surface_needs_frame;
}; };
struct sway_output *output_create(struct wlr_output *wlr_output); struct sway_output *output_create(struct wlr_output *wlr_output);

8
sway/desktop/output.c
View file

@ -515,9 +515,6 @@ static int output_repaint_timer_handler(void *data) {
output->wlr_output->frame_pending = false; output->wlr_output->frame_pending = false;
bool surface_needs_frame = output->surface_needs_frame;
output->surface_needs_frame = false;
struct sway_workspace *workspace = output->current.active_workspace; struct sway_workspace *workspace = output->current.active_workspace;
if (workspace == NULL) { if (workspace == NULL) {
return 0; return 0;
@ -562,10 +559,6 @@ static int output_repaint_timer_handler(void *data) {
output_render(output, &now, &damage); output_render(output, &now, &damage);
} else { } else {
wlr_output_rollback(output->wlr_output); wlr_output_rollback(output->wlr_output);
if (surface_needs_frame) {
wlr_output_schedule_frame(output->wlr_output);
}
} }
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
@ -682,7 +675,6 @@ static void damage_surface_iterator(struct sway_output *output, struct sway_view
} }
if (!wl_list_empty(&surface->current.frame_callback_list)) { if (!wl_list_empty(&surface->current.frame_callback_list)) {
output->surface_needs_frame = true;
wlr_output_schedule_frame(output->wlr_output); wlr_output_schedule_frame(output->wlr_output);
} }
} }