[mutter] kms/update: Change 'seal' to 'lock'
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] kms/update: Change 'seal' to 'lock'
- Date: Fri, 22 Jan 2021 17:08:29 +0000 (UTC)
commit 8876b217afb7aec641a5103f8b7191042fc9c55f
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Thu Jan 7 19:44:51 2021 +0100
kms/update: Change 'seal' to 'lock'
Sealing is a one way operation, but in the next commit, the "seal" will
be broken, so to avoid missusing the "seal" terminology, rename related
methods and variables to use the term "lock" instead. E.g.
meta_update_is_sealed() is now meta_update_is_locked().
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1488>
src/backends/native/meta-kms-update-private.h | 4 ++--
src/backends/native/meta-kms-update.c | 30 +++++++++++++--------------
src/backends/native/meta-kms.c | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/src/backends/native/meta-kms-update-private.h b/src/backends/native/meta-kms-update-private.h
index a022e28645..8f4f780cb6 100644
--- a/src/backends/native/meta-kms-update-private.h
+++ b/src/backends/native/meta-kms-update-private.h
@@ -110,9 +110,9 @@ MetaKmsFeedback * meta_kms_feedback_new_passed (GList *failed_planes);
MetaKmsFeedback * meta_kms_feedback_new_failed (GList *failed_planes,
GError *error);
-void meta_kms_update_seal (MetaKmsUpdate *update);
+void meta_kms_update_lock (MetaKmsUpdate *update);
-gboolean meta_kms_update_is_sealed (MetaKmsUpdate *update);
+gboolean meta_kms_update_is_locked (MetaKmsUpdate *update);
MetaKmsDevice * meta_kms_update_get_device (MetaKmsUpdate *update);
diff --git a/src/backends/native/meta-kms-update.c b/src/backends/native/meta-kms-update.c
index 06bfc27c8f..5815bc6663 100644
--- a/src/backends/native/meta-kms-update.c
+++ b/src/backends/native/meta-kms-update.c
@@ -32,7 +32,7 @@ struct _MetaKmsUpdate
{
MetaKmsDevice *device;
- gboolean is_sealed;
+ gboolean is_locked;
MetaPowerSave power_save;
GList *mode_sets;
@@ -152,7 +152,7 @@ meta_kms_update_assign_plane (MetaKmsUpdate *update,
{
MetaKmsPlaneAssignment *plane_assignment;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device);
g_assert (meta_kms_plane_get_device (plane) == update->device);
g_assert (meta_kms_plane_get_plane_type (plane) !=
@@ -183,7 +183,7 @@ meta_kms_update_unassign_plane (MetaKmsUpdate *update,
{
MetaKmsPlaneAssignment *plane_assignment;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device);
g_assert (meta_kms_plane_get_device (plane) == update->device);
@@ -209,7 +209,7 @@ meta_kms_update_mode_set (MetaKmsUpdate *update,
{
MetaKmsModeSet *mode_set;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device);
mode_set = g_new0 (MetaKmsModeSet, 1);
@@ -254,7 +254,7 @@ meta_kms_update_set_underscanning (MetaKmsUpdate *update,
{
MetaKmsConnectorUpdate *connector_update;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector);
@@ -270,7 +270,7 @@ meta_kms_update_unset_underscanning (MetaKmsUpdate *update,
{
MetaKmsConnectorUpdate *connector_update;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector);
@@ -285,7 +285,7 @@ meta_kms_update_set_dpms_state (MetaKmsUpdate *update,
{
MetaKmsConnectorUpdate *connector_update;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_connector_get_device (connector) == update->device);
connector_update = ensure_connector_update (update, connector);
@@ -312,7 +312,7 @@ meta_kms_update_set_crtc_gamma (MetaKmsUpdate *update,
{
MetaKmsCrtcGamma *gamma;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device);
gamma = g_new0 (MetaKmsCrtcGamma, 1);
@@ -335,7 +335,7 @@ meta_kms_update_add_page_flip_listener (MetaKmsUpdate *upd
{
MetaKmsPageFlipListener *listener;
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
g_assert (meta_kms_crtc_get_device (crtc) == update->device);
listener = g_new0 (MetaKmsPageFlipListener, 1);
@@ -354,7 +354,7 @@ meta_kms_update_set_custom_page_flip (MetaKmsUpdate *update,
MetaKmsCustomPageFlipFunc func,
gpointer user_data)
{
- g_assert (!meta_kms_update_is_sealed (update));
+ g_assert (!meta_kms_update_is_locked (update));
update->custom_page_flip_func = func;
update->custom_page_flip_user_data = user_data;
@@ -364,7 +364,7 @@ void
meta_kms_plane_assignment_set_rotation (MetaKmsPlaneAssignment *plane_assignment,
uint64_t rotation)
{
- g_assert (!meta_kms_update_is_sealed (plane_assignment->update));
+ g_assert (!meta_kms_update_is_locked (plane_assignment->update));
g_warn_if_fail (rotation);
plane_assignment->rotation = rotation;
@@ -464,15 +464,15 @@ meta_kms_update_get_crtc_gammas (MetaKmsUpdate *update)
}
void
-meta_kms_update_seal (MetaKmsUpdate *update)
+meta_kms_update_lock (MetaKmsUpdate *update)
{
- update->is_sealed = TRUE;
+ update->is_locked = TRUE;
}
gboolean
-meta_kms_update_is_sealed (MetaKmsUpdate *update)
+meta_kms_update_is_locked (MetaKmsUpdate *update)
{
- return update->is_sealed;
+ return update->is_locked;
}
MetaKmsDevice *
diff --git a/src/backends/native/meta-kms.c b/src/backends/native/meta-kms.c
index bcbf4ed7ca..18b45506ed 100644
--- a/src/backends/native/meta-kms.c
+++ b/src/backends/native/meta-kms.c
@@ -261,7 +261,7 @@ meta_kms_post_pending_update_sync (MetaKms *kms,
if (!update)
return NULL;
- meta_kms_update_seal (update);
+ meta_kms_update_lock (update);
feedback = meta_kms_run_impl_task_sync (kms,
meta_kms_process_update_in_impl,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]