brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/paint-nodes: Avoid useless copying of the LayerNode pipeline

Browse Source 
The constructor already copies the pipeline which means we can add a
snippet safely without affecting the parent pipeline, without creating
another copy.

Fixes: 6b07141f1a ("clutter/paint-nodes: Make paint nodes handle color transformations")
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4037>
This commit is contained in:
Sebastian Wick 2024-09-19 22:23:47 +02:00 committed by Marge Bot
parent 5e98ee5dbe
commit 4938987d97
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/clutter/clutter-paint-nodes.c
View File

@ -1204,7 +1204,6 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
{ {
ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node); ClutterLayerNode *lnode = CLUTTER_LAYER_NODE (node);
CoglFramebuffer *fb; CoglFramebuffer *fb;
g_autoptr (CoglPipeline) pipeline = NULL;
guint i; guint i;
/* switch to the previous framebuffer */ /* switch to the previous framebuffer */
@ -1216,9 +1215,8 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
return; return;
fb = clutter_paint_context_get_framebuffer (paint_context); fb = clutter_paint_context_get_framebuffer (paint_context);
pipeline = cogl_pipeline_copy (lnode->pipeline);
if (!cogl_pipeline_has_capability (pipeline, if (!cogl_pipeline_has_capability (lnode->pipeline,
CLUTTER_PIPELINE_CAPABILITY, CLUTTER_PIPELINE_CAPABILITY,
CLUTTER_PIPELINE_CAPABILITY_COLOR_STATE)) CLUTTER_PIPELINE_CAPABILITY_COLOR_STATE))
{ {
@ -1231,7 +1229,7 @@ clutter_layer_node_post_draw (ClutterPaintNode *node,
clutter_paint_context_get_target_color_state (paint_context); clutter_paint_context_get_target_color_state (paint_context);
clutter_color_state_add_pipeline_transform (color_state, clutter_color_state_add_pipeline_transform (color_state,
target_color_state, target_color_state,
pipeline); lnode->pipeline);
} }
for (i = 0; i < node->operations->len; i++) for (i = 0; i < node->operations->len; i++)