From 7bcbd253c20c33944219465f4f6be0c37ba17b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 5 Mar 2025 16:27:40 +0100 Subject: [PATCH] clutter: Rename ClutterFrameInfo::frame_counter to global_frame_counter To stress that it's the global frame counter. Preparation for later changes, no functional change intended. Part-of: --- clutter/clutter/clutter-stage.h | 2 +- src/backends/meta-stage-view.c | 4 ++-- src/x11/meta-sync-counter.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/clutter/clutter/clutter-stage.h b/clutter/clutter/clutter-stage.h index 879c56160..812a5e032 100644 --- a/clutter/clutter/clutter-stage.h +++ b/clutter/clutter/clutter-stage.h @@ -120,7 +120,7 @@ typedef enum */ struct _ClutterFrameInfo { - int64_t frame_counter; + int64_t global_frame_counter; int64_t presentation_time; /* microseconds; CLOCK_MONOTONIC */ int64_t target_presentation_time; /* microseconds; CLOCK_MONOTONIC */ float refresh_rate; diff --git a/src/backends/meta-stage-view.c b/src/backends/meta-stage-view.c index ad4ee521a..d80dee4bd 100644 --- a/src/backends/meta-stage-view.c +++ b/src/backends/meta-stage-view.c @@ -71,7 +71,7 @@ frame_cb (CoglOnscreen *onscreen, flags |= CLUTTER_FRAME_INFO_FLAG_VSYNC; clutter_frame_info = (ClutterFrameInfo) { - .frame_counter = cogl_frame_info_get_global_frame_counter (frame_info), + .global_frame_counter = cogl_frame_info_get_global_frame_counter (frame_info), .refresh_rate = cogl_frame_info_get_refresh_rate (frame_info), .presentation_time = cogl_frame_info_get_presentation_time_us (frame_info), @@ -212,7 +212,7 @@ meta_stage_view_perform_fake_swap (MetaStageView *view, closure = g_new0 (NotifyPresentedClosure, 1); closure->view = clutter_view; closure->frame_info = (ClutterFrameInfo) { - .frame_counter = counter, + .global_frame_counter = counter, .refresh_rate = clutter_stage_view_get_refresh_rate (clutter_view), .presentation_time = g_get_monotonic_time (), .flags = CLUTTER_FRAME_INFO_FLAG_NONE, diff --git a/src/x11/meta-sync-counter.c b/src/x11/meta-sync-counter.c index f143b3c22..f0f307614 100644 --- a/src/x11/meta-sync-counter.c +++ b/src/x11/meta-sync-counter.c @@ -519,7 +519,7 @@ meta_sync_counter_complete_frame (MetaSyncCounter *sync_counter, { GList *l_next = l->next; FrameData *frame = l->data; - int64_t frame_counter = frame_info->frame_counter; + int64_t frame_counter = frame_info->global_frame_counter; if (frame->frame_counter != -1 && frame->frame_counter <= frame_counter) {