summaryrefslogtreecommitdiff
path: root/boilerplate
diff options
context:
space:
mode:
authorGeorge Matsumura <gmmatsumura01@bvsd.org>2020-08-19 15:41:02 -0600
committerGeorge Matsumura <gmmatsumura01@bvsd.org>2020-08-25 02:30:58 -0600
commit26c7103750b3578561140b522fcc7e77ccd1ab0b (patch)
tree338e238318df8cd48c2879a08fc6ce8f60db15aa /boilerplate
parent20d475042cdd41603e0a0752779c6f74a7fae544 (diff)
downloadcairo-26c7103750b3578561140b522fcc7e77ccd1ab0b.tar.gz
cogl: Fix reference counting bugs
Signed-off-by: George Matsumura <gmmatsumura01@bvsd.org>
Diffstat (limited to 'boilerplate')
-rw-r--r--boilerplate/cairo-boilerplate-cogl.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/boilerplate/cairo-boilerplate-cogl.c b/boilerplate/cairo-boilerplate-cogl.c
index 68ee5bd5d..c293b3932 100644
--- a/boilerplate/cairo-boilerplate-cogl.c
+++ b/boilerplate/cairo-boilerplate-cogl.c
@@ -78,6 +78,9 @@ _cairo_boilerplate_cogl_create_offscreen_color_surface (const char *name,
device = cairo_cogl_device_create (context);
+ /* The device will take a reference on the context */
+ cogl_object_unref (context);
+
closure = _cairo_malloc (sizeof (cogl_closure_t));
*abstract_closure = closure;
closure->device = device;
@@ -124,19 +127,31 @@ _cairo_boilerplate_cogl_create_onscreen_color_surface (const char *name,
CoglDisplay *display;
swap_chain = cogl_swap_chain_new ();
- cogl_swap_chain_set_has_alpha (swap_chain, TRUE);
+ cogl_swap_chain_set_has_alpha (swap_chain, TRUE);
onscreen_template = cogl_onscreen_template_new (swap_chain);
renderer = cogl_renderer_new ();
display = cogl_display_new (renderer, onscreen_template);
+ /* References will be taken on the swap chain, renderer, and
+ * onscreen template by the constructors */
+ cogl_object_unref (swap_chain);
+ cogl_object_unref (renderer);
+ cogl_object_unref (onscreen_template);
+
context = cogl_context_new (display, NULL);
- } else {
+
+ /* The context will take a reference on the display */
+ cogl_object_unref (display);
+ } else {
context = cogl_context_new (NULL, NULL);
}
device = cairo_cogl_device_create (context);
+ /* The device will take a reference on the context */
+ cogl_object_unref (context);
+
closure = _cairo_malloc (sizeof (cogl_closure_t));
*abstract_closure = closure;
closure->device = device;