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

wayland/surface: Store pointers to next transaction with same surface

Browse Source 
This saves traversing all committed transactions to find the next one
which references the same surface.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880>
This commit is contained in:
Michel Dänzer 2022-06-24 16:17:23 +02:00 committed by Michel Dänzer
parent e26df6ac14
commit ff707a6de6
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/wayland/meta-wayland-transaction.c
View File

@ -44,6 +44,9 @@ struct _MetaWaylandTransaction
typedef struct _MetaWaylandTransactionEntry typedef struct _MetaWaylandTransactionEntry
{ {
/* Next committed transaction with entry for the same surface */
MetaWaylandTransaction *next_transaction;
MetaWaylandSurfaceState *state; MetaWaylandSurfaceState *state;
/* Sub-surface position */ /* Sub-surface position */
@ -127,24 +130,6 @@ meta_wayland_transaction_compare (const void *key1,
meta_wayland_surface_get_toplevel (surface2)) ? -1 : 1; meta_wayland_surface_get_toplevel (surface2)) ? -1 : 1;
} }
static MetaWaylandTransaction *
find_next_transaction_for_surface (MetaWaylandTransaction *transaction,
MetaWaylandSurface *surface)
{
GList *node;
for (node = transaction->node.next; node; node = node->next)
{
MetaWaylandTransaction *next = node->data;
if (surface->transaction.last_committed == next ||
g_hash_table_contains (next->entries, surface))
return next;
}
return NULL;
}
static void static void
ensure_next_candidate (MetaWaylandTransaction *transaction, ensure_next_candidate (MetaWaylandTransaction *transaction,
MetaWaylandTransaction **first_candidate) MetaWaylandTransaction **first_candidate)
@ -200,9 +185,8 @@ meta_wayland_transaction_apply (MetaWaylandTransaction *transaction,
} }
else else
{ {
MetaWaylandTransaction *next_transaction; MetaWaylandTransaction *next_transaction = entry->next_transaction;
next_transaction = find_next_transaction_for_surface (transaction, surface);
if (next_transaction) if (next_transaction)
{ {
surface->transaction.first_committed = next_transaction; surface->transaction.first_committed = next_transaction;
@ -284,12 +268,21 @@ meta_wayland_transaction_commit (MetaWaylandTransaction *transaction)
g_hash_table_iter_init (&iter, transaction->entries); g_hash_table_iter_init (&iter, transaction->entries);
while (g_hash_table_iter_next (&iter, (gpointer *) &surface, NULL)) while (g_hash_table_iter_next (&iter, (gpointer *) &surface, NULL))
{ {
surface->transaction.last_committed = transaction; if (surface->transaction.first_committed)
{
MetaWaylandTransactionEntry *entry;
if (!surface->transaction.first_committed) entry = g_hash_table_lookup (surface->transaction.last_committed->entries,
surface->transaction.first_committed = transaction; surface);
entry->next_transaction = transaction;
maybe_apply = FALSE;
}
else else
maybe_apply = FALSE; {
surface->transaction.first_committed = transaction;
}
surface->transaction.last_committed = transaction;
} }
if (maybe_apply) if (maybe_apply)