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

onscreen/native: Pass frame as a parameter to flip_crtc

Browse Source 
Minor style change requested by jadahl. This makes it clear earlier on
in post_next_frame that next_frame has been consumed.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1441>
This commit is contained in:
Daniel van Vugt 2025-01-31 14:26:48 +08:00 committed by Marge Bot
parent 4d4bf1244a
commit 5426935adb
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/native/meta-onscreen-native.c
View File

@ -537,6 +537,7 @@ assign_primary_plane (MetaCrtcKms *crtc_kms,
static void static void
meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen, meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen,
ClutterFrame *frame,
MetaRendererView *view, MetaRendererView *view,
MetaCrtc *crtc, MetaCrtc *crtc,
MetaKmsUpdate *kms_update, MetaKmsUpdate *kms_update,
@ -545,7 +546,6 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen,
{ {
MetaOnscreenNative *onscreen_native = META_ONSCREEN_NATIVE (onscreen); MetaOnscreenNative *onscreen_native = META_ONSCREEN_NATIVE (onscreen);
MetaRendererNative *renderer_native = onscreen_native->renderer_native; MetaRendererNative *renderer_native = onscreen_native->renderer_native;
g_autoptr (ClutterFrame) frame = NULL;
MetaFrameNative *frame_native; MetaFrameNative *frame_native;
MetaGpuKms *render_gpu = onscreen_native->render_gpu; MetaGpuKms *render_gpu = onscreen_native->render_gpu;
MetaCrtcKms *crtc_kms = META_CRTC_KMS (crtc); MetaCrtcKms *crtc_kms = META_CRTC_KMS (crtc);
@ -561,9 +561,6 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen,
COGL_TRACE_BEGIN_SCOPED (MetaOnscreenNativeFlipCrtcs, COGL_TRACE_BEGIN_SCOPED (MetaOnscreenNativeFlipCrtcs,
"Meta::OnscreenNative::flip_crtc()"); "Meta::OnscreenNative::flip_crtc()");
frame = g_steal_pointer (&onscreen_native->next_frame);
g_return_if_fail (frame);
gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc)); gpu_kms = META_GPU_KMS (meta_crtc_get_gpu (crtc));
g_assert (meta_gpu_kms_is_crtc_active (gpu_kms, crtc)); g_assert (meta_gpu_kms_is_crtc_active (gpu_kms, crtc));
@ -621,10 +618,6 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen,
#endif #endif
} }
g_warn_if_fail (!onscreen_native->posted_frame);
g_clear_pointer (&onscreen_native->posted_frame, clutter_frame_unref);
onscreen_native->posted_frame = g_steal_pointer (&frame);
meta_kms_update_add_page_flip_listener (kms_update, meta_kms_update_add_page_flip_listener (kms_update,
kms_crtc, kms_crtc,
&page_flip_listener_vtable, &page_flip_listener_vtable,
@ -1568,7 +1561,11 @@ post_next_frame (CoglOnscreen *onscreen)
return; return;
} }
frame = clutter_frame_ref (onscreen_native->next_frame); frame = g_steal_pointer (&onscreen_native->next_frame);
g_warn_if_fail (!onscreen_native->posted_frame);
g_clear_pointer (&onscreen_native->posted_frame, clutter_frame_unref);
onscreen_native->posted_frame = clutter_frame_ref (frame);
frame_native = meta_frame_native_from_frame (frame); frame_native = meta_frame_native_from_frame (frame);
region = meta_frame_native_get_damage (frame_native); region = meta_frame_native_get_damage (frame_native);
@ -1597,6 +1594,7 @@ post_next_frame (CoglOnscreen *onscreen)
ensure_crtc_modes (onscreen, kms_update); ensure_crtc_modes (onscreen, kms_update);
meta_onscreen_native_flip_crtc (onscreen, meta_onscreen_native_flip_crtc (onscreen,
frame,
onscreen_native->view, onscreen_native->view,
onscreen_native->crtc, onscreen_native->crtc,
kms_update, kms_update,