aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-03-23 18:30:20 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-03-23 18:30:20 +0000
commit6bc9fd4ba13b3f220396dd019de212461348db77 (patch)
treee6b7a8c4e362f31362f7289bc8a8f06458afcc25 /render.c
parentshm: print performance warning when FALLOC_FL_PUNCH_HOLE isn't supported (diff)
parentdelayed rendering: ignore frame callback if delayed rendering is active (diff)
Merge branch 'master' into scroll-damage-performance
Diffstat (limited to 'render.c')
-rw-r--r--render.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/render.c b/render.c
index 7189c9ba..8cefc833 100644
--- a/render.c
+++ b/render.c
@@ -1606,7 +1606,10 @@ frame_callback(void *data, struct wl_callback *wl_callback, uint32_t callback_da
if (term->render.pending.grid) {
term->render.pending.grid = false;
- grid_render(term);
+
+ /* TODO: need to check if this breaks GNOME/weston */
+ if (!term->delayed_render_timer.is_armed)
+ grid_render(term);
}
}