brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter: Rename ClutterFrameInfo::frame_counter to global_frame_counter

Browse Source 
To stress that it's the global frame counter.

Preparation for later changes, no functional change intended.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4306>
This commit is contained in:
Michel Dänzer 2025-03-05 16:27:40 +01:00 committed by Michel Dänzer
parent 1d2d62662e
commit 7bcbd253c2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter/clutter-stage.h
View File

@ -120,7 +120,7 @@ typedef enum
*/ */
struct _ClutterFrameInfo struct _ClutterFrameInfo
{ {
int64_t frame_counter; int64_t global_frame_counter;
int64_t presentation_time; /* microseconds; CLOCK_MONOTONIC */ int64_t presentation_time; /* microseconds; CLOCK_MONOTONIC */
int64_t target_presentation_time; /* microseconds; CLOCK_MONOTONIC */ int64_t target_presentation_time; /* microseconds; CLOCK_MONOTONIC */
float refresh_rate; float refresh_rate;

4
src/backends/meta-stage-view.c
View File

@ -71,7 +71,7 @@ frame_cb (CoglOnscreen *onscreen,
flags |= CLUTTER_FRAME_INFO_FLAG_VSYNC; flags |= CLUTTER_FRAME_INFO_FLAG_VSYNC;
clutter_frame_info = (ClutterFrameInfo) { 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), .refresh_rate = cogl_frame_info_get_refresh_rate (frame_info),
.presentation_time = .presentation_time =
cogl_frame_info_get_presentation_time_us (frame_info), 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 = g_new0 (NotifyPresentedClosure, 1);
closure->view = clutter_view; closure->view = clutter_view;
closure->frame_info = (ClutterFrameInfo) { closure->frame_info = (ClutterFrameInfo) {
.frame_counter = counter, .global_frame_counter = counter,
.refresh_rate = clutter_stage_view_get_refresh_rate (clutter_view), .refresh_rate = clutter_stage_view_get_refresh_rate (clutter_view),
.presentation_time = g_get_monotonic_time (), .presentation_time = g_get_monotonic_time (),
.flags = CLUTTER_FRAME_INFO_FLAG_NONE, .flags = CLUTTER_FRAME_INFO_FLAG_NONE,

2
src/x11/meta-sync-counter.c
View File

@ -519,7 +519,7 @@ meta_sync_counter_complete_frame (MetaSyncCounter *sync_counter,
{ {
GList *l_next = l->next; GList *l_next = l->next;
FrameData *frame = l->data; 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) if (frame->frame_counter != -1 && frame->frame_counter <= frame_counter)
{ {