diff options
author | Alexander Larsson <alexl@redhat.com> | 2018-04-24 16:04:57 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2018-04-24 23:24:55 +0200 |
commit | b554f4be207fc450179fd7d31c318dc3af3e4bc4 (patch) | |
tree | 8a24acbce28b9f8b70eaf30cf8f1c93712d3f1e7 /gsk/gskbroadwayrenderer.c | |
parent | a329de63ea865cd8a5e75012fe41141040d567c3 (diff) | |
download | gtk+-b554f4be207fc450179fd7d31c318dc3af3e4bc4.tar.gz |
broadway: Handle cairo nodes of type recording surface
Diffstat (limited to 'gsk/gskbroadwayrenderer.c')
-rw-r--r-- | gsk/gskbroadwayrenderer.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/gsk/gskbroadwayrenderer.c b/gsk/gskbroadwayrenderer.c index 9eeec7ce46..267864fbee 100644 --- a/gsk/gskbroadwayrenderer.c +++ b/gsk/gskbroadwayrenderer.c @@ -487,17 +487,35 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer, case GSK_CAIRO_NODE: { - const cairo_surface_t *surface = gsk_cairo_node_peek_surface (node); + cairo_surface_t *surface = (cairo_surface_t *)gsk_cairo_node_peek_surface (node); + cairo_surface_t *image_surface = NULL; GdkTexture *texture; guint32 texture_id; - texture = gdk_texture_new_for_surface ((cairo_surface_t *)surface); + if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_IMAGE) + image_surface = cairo_surface_reference (surface); + else + { + cairo_t *cr; + image_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + ceilf (node->bounds.size.width), + ceilf (node->bounds.size.height)); + cr = cairo_create (image_surface); + cairo_set_source_surface (cr, surface, 0, 0); + cairo_rectangle (cr, 0, 0, node->bounds.size.width, node->bounds.size.height); + cairo_fill (cr); + cairo_destroy (cr); + } + + texture = gdk_texture_new_for_surface (image_surface); g_ptr_array_add (node_textures, g_object_ref (texture)); /* Transfers ownership to node_textures */ texture_id = gdk_broadway_display_ensure_texture (display, texture); add_uint32 (nodes, BROADWAY_NODE_TEXTURE); add_rect (nodes, &node->bounds, offset_x, offset_y); add_uint32 (nodes, texture_id); + + cairo_surface_destroy (image_surface); } return; |