sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: Remove _real suffix from Node parenting API

Browse source 
There is no vfunc to override anymore as it used to only chain-up

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3885>
This commit is contained in:
Bilal Elmoussaoui 2024-07-15 21:31:42 +02:00
parent f5c376e860
commit 9239e8446c
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cogl/cogl/cogl-node-private.h
View file

@ -78,12 +78,12 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (CoglNode, g_object_unref)
GType cogl_node_get_type (void) G_GNUC_CONST; GType cogl_node_get_type (void) G_GNUC_CONST;
void void
_cogl_pipeline_node_set_parent_real (CoglNode *node, _cogl_pipeline_node_set_parent (CoglNode *node,
CoglNode *parent, CoglNode *parent,
gboolean take_strong_reference); gboolean take_strong_reference);
void void
_cogl_pipeline_node_unparent_real (CoglNode *node); _cogl_pipeline_node_unparent (CoglNode *node);
typedef gboolean (*CoglNodeChildCallback) (CoglNode *child, void *user_data); typedef gboolean (*CoglNodeChildCallback) (CoglNode *child, void *user_data);

10
cogl/cogl/cogl-node.c
View file

@ -51,9 +51,9 @@ cogl_node_init (CoglNode *node)
} }
void void
_cogl_pipeline_node_set_parent_real (CoglNode *node, _cogl_pipeline_node_set_parent (CoglNode *node,
CoglNode *parent, CoglNode *parent,
gboolean take_strong_reference) gboolean take_strong_reference)
{ {
/* NB: the old parent may indirectly be keeping the new parent alive /* NB: the old parent may indirectly be keeping the new parent alive
* so we have to ref the new parent before unrefing the old. * so we have to ref the new parent before unrefing the old.
@ -67,7 +67,7 @@ _cogl_pipeline_node_set_parent_real (CoglNode *node,
g_object_ref (parent); g_object_ref (parent);
if (node->parent) if (node->parent)
_cogl_pipeline_node_unparent_real (node); _cogl_pipeline_node_unparent (node);
_cogl_list_insert (&parent->children, &node->link); _cogl_list_insert (&parent->children, &node->link);
@ -83,7 +83,7 @@ _cogl_pipeline_node_set_parent_real (CoglNode *node,
} }
void void
_cogl_pipeline_node_unparent_real (CoglNode *node) _cogl_pipeline_node_unparent (CoglNode *node)
{ {
CoglNode *parent = node->parent; CoglNode *parent = node->parent;

8
cogl/cogl/cogl-pipeline-layer.c
View file

@ -54,7 +54,7 @@ cogl_pipeline_layer_dispose (GObject *object)
{ {
CoglPipelineLayer *layer = COGL_PIPELINE_LAYER (object); CoglPipelineLayer *layer = COGL_PIPELINE_LAYER (object);
_cogl_pipeline_node_unparent_real (COGL_NODE (layer)); _cogl_pipeline_node_unparent (COGL_NODE (layer));
if (layer->differences & COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA && if (layer->differences & COGL_PIPELINE_LAYER_STATE_TEXTURE_DATA &&
layer->texture != NULL) layer->texture != NULL)
@ -469,9 +469,9 @@ _cogl_pipeline_layer_set_parent (CoglPipelineLayer *layer,
CoglPipelineLayer *parent) CoglPipelineLayer *parent)
{ {
/* Chain up */ /* Chain up */
_cogl_pipeline_node_set_parent_real (COGL_NODE (layer), _cogl_pipeline_node_set_parent (COGL_NODE (layer),
COGL_NODE (parent), COGL_NODE (parent),
TRUE); TRUE);
} }
CoglPipelineLayer * CoglPipelineLayer *

10
cogl/cogl/cogl-pipeline.c
View file

@ -98,7 +98,7 @@ destroy_weak_children_cb (CoglNode *node,
NULL); NULL);
pipeline->destroy_callback (pipeline, pipeline->destroy_data); pipeline->destroy_callback (pipeline, pipeline->destroy_data);
_cogl_pipeline_node_unparent_real (COGL_NODE (pipeline)); _cogl_pipeline_node_unparent (COGL_NODE (pipeline));
} }
return TRUE; return TRUE;
@ -119,7 +119,7 @@ cogl_pipeline_dispose (GObject *object)
g_assert (_cogl_list_empty (&COGL_NODE (pipeline)->children)); g_assert (_cogl_list_empty (&COGL_NODE (pipeline)->children));
_cogl_pipeline_node_unparent_real (COGL_NODE (pipeline)); _cogl_pipeline_node_unparent (COGL_NODE (pipeline));
if (pipeline->differences & COGL_PIPELINE_STATE_USER_SHADER && if (pipeline->differences & COGL_PIPELINE_STATE_USER_SHADER &&
pipeline->big_state->user_program) pipeline->big_state->user_program)
@ -284,9 +284,9 @@ _cogl_pipeline_set_parent (CoglPipeline *pipeline,
gboolean take_strong_reference) gboolean take_strong_reference)
{ {
/* Chain up */ /* Chain up */
_cogl_pipeline_node_set_parent_real (COGL_NODE (pipeline), _cogl_pipeline_node_set_parent (COGL_NODE (pipeline),
COGL_NODE (parent), COGL_NODE (parent),
take_strong_reference); take_strong_reference);
/* Since we just changed the ancestry of the pipeline its cache of /* Since we just changed the ancestry of the pipeline its cache of
* layers could now be invalid so free it... */ * layers could now be invalid so free it... */