From df284f9c9dca5c2d1784c06a8bc8be83e97e078e Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Thu, 9 Aug 2018 12:19:53 -0300 Subject: [PATCH] clutter: Rename SYNC_TO_VBLANK to SWAP_THROTTLE This is to reflect what this flag is actually about. https://gitlab.gnome.org/GNOME/mutter/merge_requests/191 --- clutter/clutter/clutter-backend.c | 2 +- clutter/clutter/clutter-enums.h | 4 ++-- clutter/clutter/clutter-master-clock-default.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clutter/clutter/clutter-backend.c b/clutter/clutter/clutter-backend.c index 4172ed363..1f80cbf21 100644 --- a/clutter/clutter/clutter-backend.c +++ b/clutter/clutter/clutter-backend.c @@ -430,7 +430,7 @@ clutter_backend_real_get_features (ClutterBackend *backend) if (cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_SWAP_THROTTLE)) { CLUTTER_NOTE (BACKEND, "Cogl supports swap buffers throttling"); - flags |= CLUTTER_FEATURE_SYNC_TO_VBLANK; + flags |= CLUTTER_FEATURE_SWAP_THROTTLE; } else CLUTTER_NOTE (BACKEND, "Cogl doesn't support swap buffers throttling"); diff --git a/clutter/clutter/clutter-enums.h b/clutter/clutter/clutter-enums.h index ad038cc93..ddd86ab48 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -884,7 +884,7 @@ typedef enum { /** * ClutterFeatureFlags: * @CLUTTER_FEATURE_TEXTURE_NPOT: Set if NPOTS textures supported. - * @CLUTTER_FEATURE_SYNC_TO_VBLANK: Set if vblank syncing supported. + * @CLUTTER_FEATURE_SWAP_THROTTLE: Set if throttling swap is supported. * @CLUTTER_FEATURE_TEXTURE_YUV: Set if YUV based textures supported. * @CLUTTER_FEATURE_TEXTURE_READ_PIXELS: Set if texture pixels can be read. * @CLUTTER_FEATURE_STAGE_STATIC: Set if stage size if fixed (i.e framebuffer) @@ -903,7 +903,7 @@ typedef enum { typedef enum { CLUTTER_FEATURE_TEXTURE_NPOT = (1 << 2), - CLUTTER_FEATURE_SYNC_TO_VBLANK = (1 << 3), + CLUTTER_FEATURE_SWAP_THROTTLE = (1 << 3), CLUTTER_FEATURE_TEXTURE_YUV = (1 << 4), CLUTTER_FEATURE_TEXTURE_READ_PIXELS = (1 << 5), CLUTTER_FEATURE_STAGE_STATIC = (1 << 6), diff --git a/clutter/clutter/clutter-master-clock-default.c b/clutter/clutter/clutter-master-clock-default.c index d28dd474f..a0909ff95 100644 --- a/clutter/clutter/clutter-master-clock-default.c +++ b/clutter/clutter/clutter-master-clock-default.c @@ -298,10 +298,10 @@ master_clock_next_frame_delay (ClutterMasterClockDefault *master_clock) * (NB: if there aren't even any timelines running then the master clock will * be completely stopped in master_clock_is_running()) */ - if (clutter_feature_available (CLUTTER_FEATURE_SYNC_TO_VBLANK) && + if (clutter_feature_available (CLUTTER_FEATURE_SWAP_THROTTLE) && !master_clock->idle) { - CLUTTER_NOTE (SCHEDULER, "vblank available and updated stages"); + CLUTTER_NOTE (SCHEDULER, "swap throttling available and updated stages"); return 0; }