isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-25 14:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

clutter: Pass 'ClutterFrame' in all stage update signals

Browse Source 
That means before-update, prepare-paint, before-paint, paint-view, after-paint,
after-update. While yet to be used, it will be used as a transient frame
book keeping object, to maintain object and state that is only valid
during a frame dispatch.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2795>
This commit is contained in:
Jonas Ådahl
2022-10-13 17:50:34 +02:00
parent 24f44aa33e
commit 08b0e563d4
30 changed files with 126 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/backends/meta-cursor-renderer.c
View File

@ -165,6 +165,7 @@ meta_cursor_renderer_update_stage_overlay (MetaCursorRenderer *renderer,
static void
meta_cursor_renderer_after_paint (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaCursorRenderer *renderer)
{
MetaCursorRendererPrivate *priv =

1
src/backends/meta-screen-cast-area-stream-src.c
View File

@ -191,6 +191,7 @@ cursor_changed (MetaCursorTracker *cursor_tracker,
static void
on_prepare_frame (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaScreenCastAreaStreamSrc *area_src)
{
sync_cursor_state (area_src);

1
src/backends/meta-screen-cast-monitor-stream-src.c
View File

@ -287,6 +287,7 @@ cursor_changed (MetaCursorTracker *cursor_tracker,
static void
on_prepare_frame (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaScreenCastMonitorStreamSrc *monitor_src)
{
sync_cursor_state (monitor_src);

1
src/backends/meta-screen-cast-virtual-stream-src.c
View File

@ -146,6 +146,7 @@ cursor_changed (MetaCursorTracker *cursor_tracker,
static void
on_prepare_frame (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaScreenCastVirtualStreamSrc *virtual_src)
{
sync_cursor_state (virtual_src);

11
src/backends/meta-stage-impl.c
View File

@ -396,12 +396,13 @@ scale_offset_and_clamp_region (const cairo_region_t *region,
static void
paint_stage (MetaStageImpl *stage_impl,
ClutterStageView *stage_view,
cairo_region_t *redraw_clip)
cairo_region_t *redraw_clip,
ClutterFrame *frame)
{
ClutterStage *stage = stage_impl->wrapper;
_clutter_stage_maybe_setup_viewport (stage, stage_view);
clutter_stage_paint_view (stage, stage_view, redraw_clip);
clutter_stage_paint_view (stage, stage_view, redraw_clip, frame);
clutter_stage_view_after_paint (stage_view, redraw_clip);
}
@ -607,7 +608,7 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl *stage_impl,
cairo_region_t *debug_redraw_clip;
debug_redraw_clip = cairo_region_create_rectangle (&view_rect);
paint_stage (stage_impl, stage_view, debug_redraw_clip);
paint_stage (stage_impl, stage_view, debug_redraw_clip, frame);
cairo_region_destroy (debug_redraw_clip);
}
else if (use_clipped_redraw)
@ -616,7 +617,7 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl *stage_impl,
cogl_framebuffer_push_region_clip (fb, fb_clip_region);
paint_stage (stage_impl, stage_view, redraw_clip);
paint_stage (stage_impl, stage_view, redraw_clip, frame);
cogl_framebuffer_pop_clip (fb);
}
@ -624,7 +625,7 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl *stage_impl,
{
meta_topic (META_DEBUG_BACKEND, "Unclipped stage paint");
paint_stage (stage_impl, stage_view, redraw_clip);
paint_stage (stage_impl, stage_view, redraw_clip, frame);
}
g_clear_pointer (&redraw_clip, cairo_region_destroy);

9
src/backends/meta-stage.c
View File

@ -209,7 +209,8 @@ notify_watchers_for_mode (MetaStage *stage,
static void
meta_stage_before_paint (ClutterStage *stage,
ClutterStageView *view)
ClutterStageView *view,
ClutterFrame *frame)
{
MetaStage *meta_stage = META_STAGE (stage);
@ -267,12 +268,14 @@ meta_stage_paint (ClutterActor *actor,
static void
meta_stage_paint_view (ClutterStage *stage,
ClutterStageView *view,
const cairo_region_t *redraw_clip)
const cairo_region_t *redraw_clip,
ClutterFrame *frame)
{
MetaStage *meta_stage = META_STAGE (stage);
CLUTTER_STAGE_CLASS (meta_stage_parent_class)->paint_view (stage, view,
redraw_clip);
redraw_clip,
frame);
notify_watchers_for_mode (meta_stage, view, NULL,
META_STAGE_WATCH_AFTER_PAINT);

2
src/compositor/compositor.c
View File

@ -1159,6 +1159,7 @@ meta_compositor_after_paint (MetaCompositor *compositor,
static void
on_before_paint (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaCompositor *compositor)
{
MetaCompositorView *compositor_view;
@ -1174,6 +1175,7 @@ on_before_paint (ClutterStage *stage,
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaCompositor *compositor)
{
MetaCompositorView *compositor_view;

2
src/compositor/meta-compositor-x11.c
View File

@ -335,6 +335,7 @@ out:
static void
on_before_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaCompositor *compositor)
{
MetaCompositorX11 *compositor_x11 = META_COMPOSITOR_X11 (compositor);
@ -373,6 +374,7 @@ on_before_update (ClutterStage *stage,
static void
on_after_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaCompositor *compositor)
{
MetaCompositorX11 *compositor_x11 = META_COMPOSITOR_X11 (compositor);

1
src/compositor/meta-later.c
View File

@ -173,6 +173,7 @@ run_repaint_laters (GSList **laters_list)
static void
on_before_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaLaters *laters)
{
unsigned int i;

1
src/tests/clutter/conform/actor-shader-effect.c
View File

@ -234,6 +234,7 @@ static void
view_painted_cb (ClutterStage *stage,
ClutterStageView *view,
cairo_region_t *redraw_clip,
ClutterFrame *frame,
gpointer data)
{
CoglFramebuffer *fb = clutter_stage_view_get_framebuffer (view);

1
src/tests/clutter/conform/event-delivery.c
View File

@ -5,6 +5,7 @@
static void
on_after_update (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gboolean *was_updated)
{
*was_updated = TRUE;

1
src/tests/clutter/interactive/test-cogl-point-sprites.c
View File

@ -102,6 +102,7 @@ generate_round_texture (CoglContext *ctx)
static void
on_after_paint (ClutterActor *stage,
ClutterPaintContext *paint_context,
ClutterFrame *frame,
Data *data)
{
CoglFramebuffer *framebuffer =

3
src/tests/clutter/micro-bench/test-picking.c
View File

@ -38,7 +38,8 @@ do_events (ClutterActor *stage)
static void
on_after_paint (ClutterActor *stage,
ClutterPaintContext *paint_context,
ClutterStageView *view,
ClutterFrame *frame,
gconstpointer *data)
{
do_events (stage);

3
src/tests/clutter/micro-bench/test-text-perf.c
View File

@ -14,7 +14,8 @@ static int rows, cols;
static void
on_after_paint (ClutterActor *actor,
ClutterPaintContext *paint_context,
ClutterStageView *view,
ClutterFrame *frame,
gconstpointer *data)
{
static GTimer *timer = NULL;

3
src/tests/clutter/micro-bench/test-text.c
View File

@ -13,7 +13,8 @@
static void
on_after_paint (ClutterActor *actor,
ClutterPaintContext *paint_context,
ClutterStageView *view,
ClutterFrame *frame,
gconstpointer *data)
{
static GTimer *timer = NULL;

14
src/tests/clutter/performance/test-common.h
View File

@ -28,9 +28,10 @@ clutter_perf_fps_init (void)
g_random_set_seed (12345678);
}
static void perf_stage_after_paint_cb (ClutterStage *stage,
ClutterPaintContext *paint_context,
gpointer *data);
static void perf_stage_after_paint_cb (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gpointer *data);
static gboolean perf_fake_mouse_cb (gpointer stage);
static inline void
@ -53,9 +54,10 @@ clutter_perf_fps_report (const gchar *id)
}
static void
perf_stage_after_paint_cb (ClutterStage *stage,
ClutterPaintContext *paint_context,
gpointer *data)
perf_stage_after_paint_cb (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gpointer *data)
{
if (!testtimer)
testtimer = g_timer_new ();

3
src/tests/cogl/conform/test-readpixels.c
View File

@ -16,7 +16,8 @@ static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
static void
on_after_paint (ClutterActor *actor,
ClutterPaintContext *paint_context,
ClutterStageView *stage_view,
ClutterFrame *frame,
void *state)
{
float saved_viewport[4];

7
src/tests/cogl/conform/test-texture-pixmap-x11.c
View File

@ -140,9 +140,10 @@ check_paint (TestState *state, int x, int y, int scale)
#define FRAME_COUNT_UPDATED 8
static void
on_after_paint (ClutterActor *actor,
ClutterPaintContext *paint_context,
TestState *state)
on_after_paint (ClutterActor *actor,
ClutterStageView *view,
ClutterFrame *frame,
TestState *state)
{
CoglPipeline *pipeline;

8
src/tests/cogl/conform/test-viewport.c
View File

@ -64,11 +64,11 @@ assert_rectangle_color_and_black_border (int x,
assert_region_color (x-10, y+height, width+20, 10, 0x00, 0x00, 0x00, 0xff);
}
static void
on_after_paint (ClutterActor *actor,
ClutterPaintContext *paint_context,
void *state)
on_after_paint (ClutterActor *actor,
ClutterStageView *view,
ClutterFrame *frame,
void *state)
{
float saved_viewport[4];
graphene_matrix_t saved_projection;

1
src/tests/meta-backend-test.c
View File

@ -88,6 +88,7 @@ meta_backend_test_create_color_manager (MetaBackend *backend)
static void
on_after_update (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gboolean *was_updated)
{
*was_updated = TRUE;

2
src/tests/meta-wayland-test-driver.c
View File

@ -105,6 +105,7 @@ on_effects_completed (ClutterActor *actor,
static void
check_for_pending_effects (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
PendingEffectsData *data)
{
MetaWindow *window;
@ -178,6 +179,7 @@ sync_point (struct wl_client *client,
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
struct wl_resource *callback)
{
g_signal_handlers_disconnect_by_data (stage, callback);

4
src/tests/native-kms-render.c
View File

@ -54,6 +54,7 @@ static MetaContext *test_context;
static void
on_after_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
KmsRenderingTest *test)
{
test->number_of_frames_left--;
@ -90,6 +91,7 @@ meta_test_kms_render_basic (void)
static void
on_scanout_before_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
KmsRenderingTest *test)
{
test->scanout.n_paints = 0;
@ -99,6 +101,7 @@ on_scanout_before_update (ClutterStage *stage,
static void
on_scanout_before_paint (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
KmsRenderingTest *test)
{
CoglScanout *scanout;
@ -118,6 +121,7 @@ static void
on_scanout_paint_view (ClutterStage *stage,
ClutterStageView *stage_view,
cairo_region_t *region,
ClutterFrame *frame,
KmsRenderingTest *test)
{
test->scanout.n_paints++;

1
src/tests/stage-view-tests.c
View File

@ -94,6 +94,7 @@ meta_test_stage_views_exist (void)
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gboolean *was_painted)
{
*was_painted = TRUE;

1
src/tests/wayland-unit-tests.c
View File

@ -126,6 +126,7 @@ subsurface_invalid_xdg_shell_actions (void)
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *view,
ClutterFrame *frame,
gboolean *was_painted)
{
*was_painted = TRUE;

1
src/wayland/meta-wayland-presentation-time.c
View File

@ -130,6 +130,7 @@ discard_non_cursor_feedbacks (struct wl_list *feedbacks)
static void
on_after_paint (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaWaylandCompositor *compositor)
{
struct wl_list *feedbacks;

1
src/wayland/meta-wayland.c
View File

@ -214,6 +214,7 @@ meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
static void
on_after_update (ClutterStage *stage,
ClutterStageView *stage_view,
ClutterFrame *frame,
MetaWaylandCompositor *compositor)
{
GList *l;