From 94ab6d8736624cea3c17c103404b62a5eaf624b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 1 Oct 2020 17:20:22 +0200 Subject: [PATCH] crtc/kms: Remove page flip helper The only thing it did was shuffle around arguments and calling a getter. lets just do that ourself in the call site. Part-of: --- src/backends/native/meta-crtc-kms.c | 14 -------------- src/backends/native/meta-crtc-kms.h | 6 ------ src/backends/native/meta-renderer-native.c | 10 +++++----- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/src/backends/native/meta-crtc-kms.c b/src/backends/native/meta-crtc-kms.c index 98d83845d..82b68ed6f 100644 --- a/src/backends/native/meta-crtc-kms.c +++ b/src/backends/native/meta-crtc-kms.c @@ -204,20 +204,6 @@ meta_crtc_kms_set_mode (MetaCrtcKms *crtc_kms, kms_mode); } -void -meta_crtc_kms_page_flip (MetaCrtcKms *crtc_kms, - const MetaKmsPageFlipFeedback *page_flip_feedback, - MetaKmsPageFlipFlag flags, - gpointer user_data, - MetaKmsUpdate *kms_update) -{ - meta_kms_update_page_flip (kms_update, - meta_crtc_kms_get_kms_crtc (crtc_kms), - page_flip_feedback, - flags, - user_data); -} - MetaKmsCrtc * meta_crtc_kms_get_kms_crtc (MetaCrtcKms *crtc_kms) { diff --git a/src/backends/native/meta-crtc-kms.h b/src/backends/native/meta-crtc-kms.h index 3d22b576e..c13034eeb 100644 --- a/src/backends/native/meta-crtc-kms.h +++ b/src/backends/native/meta-crtc-kms.h @@ -56,12 +56,6 @@ void meta_crtc_kms_assign_primary_plane (MetaCrtcKms *crtc_kms, void meta_crtc_kms_set_mode (MetaCrtcKms *crtc_kms, MetaKmsUpdate *kms_update); -void meta_crtc_kms_page_flip (MetaCrtcKms *crtc_kms, - const MetaKmsPageFlipFeedback *page_flip_feedback, - MetaKmsPageFlipFlag flags, - gpointer user_data, - MetaKmsUpdate *kms_update); - void meta_crtc_kms_set_is_underscanning (MetaCrtcKms *crtc_kms, gboolean is_underscanning); diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index fb7c1d869..5cb884cb8 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -1291,11 +1291,11 @@ meta_onscreen_native_flip_crtc (CoglOnscreen *onscreen, } meta_crtc_kms_assign_primary_plane (crtc_kms, buffer, kms_update); - meta_crtc_kms_page_flip (crtc_kms, - &page_flip_feedback, - flags, - g_object_ref (view), - kms_update); + meta_kms_update_page_flip (kms_update, + meta_crtc_kms_get_kms_crtc (crtc_kms), + &page_flip_feedback, + flags, + g_object_ref (view)); break; #ifdef HAVE_EGL_DEVICE