diff options
| author | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2018-08-09 12:19:53 -0300 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2018-08-09 12:21:54 -0300 |
| commit | b1102b74f886d43a826c79222c7031dfe455ba09 (patch) | |
| tree | a1b2933954f5533c3d681c2bbab04dcc9b846b7c | |
| parent | c3988f9595893cc84fd44b4c65ed1b6d462d0f69 (diff) | |
| download | mutter-gbsneto/kill-vblank.tar.gz | |
clutter: Rename SYNC_TO_VBLANK to SWAP_THROTTLEgbsneto/kill-vblank
This is to reflect what this flag is actually about.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/191
| -rw-r--r-- | clutter/clutter/clutter-backend.c | 2 | ||||
| -rw-r--r-- | clutter/clutter/clutter-enums.h | 4 | ||||
| -rw-r--r-- | 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 30ebe5ef1..fefd2ee03 100644 --- a/clutter/clutter/clutter-backend.c +++ b/clutter/clutter/clutter-backend.c @@ -433,7 +433,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 b9987d875..f36de23ee 100644 --- a/clutter/clutter/clutter-enums.h +++ b/clutter/clutter/clutter-enums.h @@ -882,7 +882,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) @@ -901,7 +901,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 7b2df0df3..5a8a11ec8 100644 --- a/clutter/clutter/clutter-master-clock-default.c +++ b/clutter/clutter/clutter-master-clock-default.c @@ -300,10 +300,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; } |