[mutter/gbsneto/layer-node-cleanups: 10/12] clutter/layer-node: Trivial code cleanup
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/layer-node-cleanups: 10/12] clutter/layer-node: Trivial code cleanup
- Date: Thu, 2 Apr 2020 18:51:15 +0000 (UTC)
commit 625773fba446f193f1b72b8ea880888d8a37ec7c
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Mar 30 21:46:30 2020 -0300
clutter/layer-node: Trivial code cleanup
Both the valid and the error code paths end up unreffing
the texture. Move the unref to the shared code path.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1167
clutter/clutter/clutter-paint-nodes.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/clutter/clutter/clutter-paint-nodes.c b/clutter/clutter/clutter-paint-nodes.c
index 31283c13e..a6c65aae7 100644
--- a/clutter/clutter/clutter-paint-nodes.c
+++ b/clutter/clutter/clutter-paint-nodes.c
@@ -1447,9 +1447,6 @@ clutter_layer_node_new (const CoglMatrix *projection,
if (res->offscreen == NULL)
{
g_critical ("%s: Unable to create an offscreen buffer", G_STRLOC);
-
- cogl_object_unref (texture);
-
goto out;
}
@@ -1465,8 +1462,9 @@ clutter_layer_node_new (const CoglMatrix *projection,
COGL_PIPELINE_FILTER_NEAREST);
cogl_pipeline_set_layer_texture (res->pipeline, 0, texture);
cogl_pipeline_set_color (res->pipeline, &color);
- cogl_object_unref (texture);
out:
+ cogl_object_unref (texture);
+
return (ClutterPaintNode *) res;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]