isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

clutter/pick-stack: Store current matrix entry

Browse Source 
This is the beginning of the preparations to passing unprojected
rectangles to the clip stack. Store a ref to the current tip of
the matrix entry.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1509
This commit is contained in:
Georges Basile Stavracas Neto 2020-10-17 09:37:39 -03:00
parent f411834d42
commit 620f0ad74b
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/clutter/clutter-pick-stack.c
View File

@ -23,12 +23,14 @@ typedef struct
graphene_point_t vertices[4]; graphene_point_t vertices[4];
ClutterActor *actor; ClutterActor *actor;
int clip_index; int clip_index;
CoglMatrixEntry *matrix_entry;
} PickRecord; } PickRecord;
typedef struct typedef struct
{ {
int prev; int prev;
graphene_point_t vertices[4]; graphene_point_t vertices[4];
CoglMatrixEntry *matrix_entry;
} PickClipRecord; } PickClipRecord;
struct _ClutterPickStack struct _ClutterPickStack
@ -224,6 +226,20 @@ clutter_pick_stack_dispose (ClutterPickStack *pick_stack)
g_clear_pointer (&pick_stack->clip_stack, g_array_unref); g_clear_pointer (&pick_stack->clip_stack, g_array_unref);
} }
static void
clear_pick_record (gpointer data)
{
PickRecord *rec = data;
g_clear_pointer (&rec->matrix_entry, cogl_matrix_entry_unref);
}
static void
clear_clip_record (gpointer data)
{
PickClipRecord *clip = data;
g_clear_pointer (&clip->matrix_entry, cogl_matrix_entry_unref);
}
/** /**
* clutter_pick_stack_new: * clutter_pick_stack_new:
* @context: a #CoglContext * @context: a #CoglContext
@ -244,6 +260,9 @@ clutter_pick_stack_new (CoglContext *context)
pick_stack->clip_stack = g_array_new (FALSE, FALSE, sizeof (PickClipRecord)); pick_stack->clip_stack = g_array_new (FALSE, FALSE, sizeof (PickClipRecord));
pick_stack->current_clip_stack_top = -1; pick_stack->current_clip_stack_top = -1;
g_array_set_clear_func (pick_stack->vertices_stack, clear_pick_record);
g_array_set_clear_func (pick_stack->clip_stack, clear_clip_record);
return pick_stack; return pick_stack;
} }
@ -301,6 +320,8 @@ clutter_pick_stack_log_pick (ClutterPickStack *pick_stack,
memcpy (rec.vertices, vertices, 4 * sizeof (graphene_point_t)); memcpy (rec.vertices, vertices, 4 * sizeof (graphene_point_t));
rec.actor = actor; rec.actor = actor;
rec.clip_index = pick_stack->current_clip_stack_top; rec.clip_index = pick_stack->current_clip_stack_top;
rec.matrix_entry = cogl_matrix_stack_get_entry (pick_stack->matrix_stack);
cogl_matrix_entry_ref (rec.matrix_entry);
g_array_append_val (pick_stack->vertices_stack, rec); g_array_append_val (pick_stack->vertices_stack, rec);
} }
@ -315,6 +336,8 @@ clutter_pick_stack_push_clip (ClutterPickStack *pick_stack,
clip.prev = pick_stack->current_clip_stack_top; clip.prev = pick_stack->current_clip_stack_top;
memcpy (clip.vertices, vertices, 4 * sizeof (graphene_point_t)); memcpy (clip.vertices, vertices, 4 * sizeof (graphene_point_t));
clip.matrix_entry = cogl_matrix_stack_get_entry (pick_stack->matrix_stack);
cogl_matrix_entry_ref (clip.matrix_entry);
g_array_append_val (pick_stack->clip_stack, clip); g_array_append_val (pick_stack->clip_stack, clip);
pick_stack->current_clip_stack_top = pick_stack->clip_stack->len - 1; pick_stack->current_clip_stack_top = pick_stack->clip_stack->len - 1;