diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c index 330f16b75..07b8e9a2a 100644 --- a/clutter/clutter/clutter-main.c +++ b/clutter/clutter/clutter-main.c @@ -255,16 +255,6 @@ clutter_config_read_from_key_file (GKeyFile *keyfile) else clutter_enable_accessibility = bool_value; - bool_value = - g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP, - "SyncToVblank", - &key_error); - - if (key_error != NULL) - g_clear_error (&key_error); - else - clutter_sync_to_vblank = bool_value; - int_value = g_key_file_get_integer (keyfile, ENVIRONMENT_GROUP, "DefaultFps", @@ -1491,10 +1481,6 @@ pre_parse_hook (GOptionContext *context, if (env_string) clutter_use_fuzzy_picking = TRUE; - env_string = g_getenv ("CLUTTER_VBLANK"); - if (g_strcmp0 (env_string, "none") == 0) - clutter_sync_to_vblank = FALSE; - return _clutter_backend_pre_parse (backend, error); } @@ -3635,12 +3621,6 @@ _clutter_set_sync_to_vblank (gboolean sync_to_vblank) clutter_sync_to_vblank = !!sync_to_vblank; } -gboolean -_clutter_get_sync_to_vblank (void) -{ - return clutter_sync_to_vblank; -} - void _clutter_debug_messagev (const char *format, va_list var_args) diff --git a/clutter/clutter/clutter-mutter.h b/clutter/clutter/clutter-mutter.h index bb2140e47..d5d0340ff 100644 --- a/clutter/clutter/clutter-mutter.h +++ b/clutter/clutter/clutter-mutter.h @@ -34,9 +34,6 @@ CLUTTER_EXPORT void clutter_set_custom_backend_func (ClutterBackend *(* func) (void)); -CLUTTER_EXPORT -gboolean _clutter_get_sync_to_vblank (void); - CLUTTER_EXPORT int64_t clutter_stage_get_frame_counter (ClutterStage *stage); diff --git a/clutter/clutter/x11/clutter-stage-x11.c b/clutter/clutter/x11/clutter-stage-x11.c index 1ee2f40ab..ee7857cb6 100644 --- a/clutter/clutter/x11/clutter-stage-x11.c +++ b/clutter/clutter/x11/clutter-stage-x11.c @@ -631,8 +631,7 @@ clutter_stage_x11_realize (ClutterStageWindow *stage_window) stage_x11->onscreen = cogl_onscreen_new (backend->cogl_context, width, height); - cogl_onscreen_set_swap_throttled (stage_x11->onscreen, - _clutter_get_sync_to_vblank ()); + cogl_onscreen_set_swap_throttled (stage_x11->onscreen, TRUE); stage_x11->frame_closure = cogl_onscreen_add_frame_callback (stage_x11->onscreen, frame_cb, diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index e2e977f8d..0a06beb87 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -2729,9 +2729,6 @@ meta_renderer_native_create_onscreen (MetaRendererNative *renderer_native, /* We have wait_for_pending_flips hardcoded, so throttling always. */ cogl_onscreen_set_swap_throttled (onscreen, TRUE); - if (!_clutter_get_sync_to_vblank ()) - g_warning ("Request to disable sync-to-vblank is being ignored. " - "MetaRendererNative does not support disabling it."); if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (onscreen), error)) {