From 1a915f06cf0958335e9a82d9a363bbc71aa12558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sat, 23 May 2020 19:51:12 +0200 Subject: [PATCH] clutter: Remove CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD It was unused, and will simplify things when we're without a master clock. https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1289 --- clutter/clutter/clutter-enums.h | 3 --- clutter/clutter/clutter-main.c | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index 4b9b62bcf..bbc759d38 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -1317,8 +1317,6 @@ typedef enum * painting the stages * @CLUTTER_REPAINT_FLAGS_POST_PAINT: Run the repaint function after * painting the stages - * @CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD: Ensure that a new frame - * is queued after adding the repaint function * * Flags to pass to clutter_threads_add_repaint_func_full(). * @@ -1328,7 +1326,6 @@ typedef enum { CLUTTER_REPAINT_FLAGS_PRE_PAINT = 1 << 0, CLUTTER_REPAINT_FLAGS_POST_PAINT = 1 << 1, - CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD = 1 << 2 } ClutterRepaintFlags; /** diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index 0114244b8..84a10bb5d 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -2392,8 +2392,7 @@ clutter_threads_add_repaint_func_full (ClutterRepaintFlags flags, repaint_func->id = context->last_repaint_id++; - /* mask out QUEUE_REDRAW_ON_ADD, since we're going to consume it */ - repaint_func->flags = flags & ~CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD; + repaint_func->flags = flags; repaint_func->func = func; repaint_func->data = data; repaint_func->notify = notify; @@ -2403,13 +2402,6 @@ clutter_threads_add_repaint_func_full (ClutterRepaintFlags flags, _clutter_context_unlock (); - if ((flags & CLUTTER_REPAINT_FLAGS_QUEUE_REDRAW_ON_ADD) != 0) - { - ClutterMasterClock *master_clock = _clutter_master_clock_get_default (); - - _clutter_master_clock_ensure_next_iteration (master_clock); - } - return repaint_func->id; }