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

clutter/stage-window: Pass 'view' to finish_frame() too

Browse Source 
Not used yet, just done separately to decrease future diffs.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
This commit is contained in:
Jonas Ådahl 2020-10-09 18:02:03 +02:00 committed by Marge Bot
parent 3bd0037fa1
commit 722f7ae2c3
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter/clutter-stage-view.c
View File

@ -1106,7 +1106,7 @@ handle_frame_clock_frame (ClutterFrameClock *frame_clock,
clutter_stage_emit_after_paint (stage, view); clutter_stage_emit_after_paint (stage, view);
_clutter_stage_window_finish_frame (stage_window); _clutter_stage_window_finish_frame (stage_window, view);
result = CLUTTER_FRAME_RESULT_PENDING_PRESENTED; result = CLUTTER_FRAME_RESULT_PENDING_PRESENTED;
} }

5
clutter/clutter/clutter-stage-window.c
View File

@ -134,12 +134,13 @@ _clutter_stage_window_get_views (ClutterStageWindow *window)
} }
void void
_clutter_stage_window_finish_frame (ClutterStageWindow *window) _clutter_stage_window_finish_frame (ClutterStageWindow *window,
ClutterStageView *view)
{ {
ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window); ClutterStageWindowInterface *iface = CLUTTER_STAGE_WINDOW_GET_IFACE (window);
if (iface->finish_frame) if (iface->finish_frame)
iface->finish_frame (window); iface->finish_frame (window, view);
} }
int64_t int64_t

6
clutter/clutter/clutter-stage-window.h
View File

@ -51,7 +51,8 @@ struct _ClutterStageWindowInterface
GList *(* get_views) (ClutterStageWindow *stage_window); GList *(* get_views) (ClutterStageWindow *stage_window);
int64_t (* get_frame_counter) (ClutterStageWindow *stage_window); int64_t (* get_frame_counter) (ClutterStageWindow *stage_window);
void (* finish_frame) (ClutterStageWindow *stage_window); void (* finish_frame) (ClutterStageWindow *stage_window,
ClutterStageView *view);
}; };
ClutterActor * _clutter_stage_window_get_wrapper (ClutterStageWindow *window); ClutterActor * _clutter_stage_window_get_wrapper (ClutterStageWindow *window);
@ -85,7 +86,8 @@ gboolean _clutter_stage_window_can_clip_redraws (ClutterStageWin
GList * _clutter_stage_window_get_views (ClutterStageWindow *window); GList * _clutter_stage_window_get_views (ClutterStageWindow *window);
void _clutter_stage_window_finish_frame (ClutterStageWindow *window); void _clutter_stage_window_finish_frame (ClutterStageWindow *window,
ClutterStageView *view);
int64_t _clutter_stage_window_get_frame_counter (ClutterStageWindow *window); int64_t _clutter_stage_window_get_frame_counter (ClutterStageWindow *window);

3
src/backends/native/meta-stage-native.c
View File

@ -106,7 +106,8 @@ meta_stage_native_get_views (ClutterStageWindow *stage_window)
} }
static void static void
meta_stage_native_finish_frame (ClutterStageWindow *stage_window) meta_stage_native_finish_frame (ClutterStageWindow *stage_window,
ClutterStageView *stage_view)
{ {
MetaBackend *backend = meta_get_backend (); MetaBackend *backend = meta_get_backend ();
MetaRenderer *renderer = meta_backend_get_renderer (backend); MetaRenderer *renderer = meta_backend_get_renderer (backend);

3
src/backends/x11/nested/meta-stage-x11-nested.c
View File

@ -158,7 +158,8 @@ draw_view (MetaStageX11Nested *stage_nested,
} }
static void static void
meta_stage_x11_nested_finish_frame (ClutterStageWindow *stage_window) meta_stage_x11_nested_finish_frame (ClutterStageWindow *stage_window,
ClutterStageView *stage_view)
{ {
MetaStageX11Nested *stage_nested = META_STAGE_X11_NESTED (stage_window); MetaStageX11Nested *stage_nested = META_STAGE_X11_NESTED (stage_window);
MetaStageX11 *stage_x11 = META_STAGE_X11 (stage_window); MetaStageX11 *stage_x11 = META_STAGE_X11 (stage_window);