buffer: reduce unnecessary painting to new cairo surfaces

Add buffer_adopt_cairo_surface(), which allows wrapping an existing
cairo image surface in a struct lab_data_buffer. This is useful when
loading PNGs since most will be loaded as ARGB32 already.

Fix a memory leak in the non-ARGB32 PNG case, where we do still need to
paint to a new image surface -- we were leaking the original surface.

Eliminate an unnecessary temporary image surface in SVG loading and just
render the SVG to the image surface held by the lab_data_buffer.

I also cleaned up and clarified the buffer API a bit:

- Add a pointer to the held cairo_surface_t (so we can still access it
  if there is no cairo_t).
- Remove the free_on_destroy bool (it was always true).
- Rename unscaled_width/height to logical_width/height and add an
  explanatory comment. It was unclear what "unscaled" meant.
- Rename buffer_create_wrap() to buffer_create_from_data().

This is laying groundwork for some more icon fixes I am working on
(making sure icons are loaded and rendered at the correct scale).
This commit is contained in:
John Lindgren 2024-10-06 01:42:54 -04:00 committed by Johan Malm
parent 328f873db3
commit d2b161bdf8
14 changed files with 123 additions and 84 deletions

View file

@ -39,8 +39,9 @@ img_svg_load(const char *filename, struct lab_data_buffer **buffer,
return;
}
cairo_surface_t *image = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, size, size);
cairo_t *cr = cairo_create(image);
*buffer = buffer_create_cairo(size, size, 1.0);
cairo_surface_t *image = (*buffer)->surface;
cairo_t *cr = (*buffer)->cairo;
rsvg_handle_render_document(svg, cr, &viewport, &err);
if (err) {
@ -55,15 +56,11 @@ img_svg_load(const char *filename, struct lab_data_buffer **buffer,
}
cairo_surface_flush(image);
double w = cairo_image_surface_get_width(image);
double h = cairo_image_surface_get_height(image);
*buffer = buffer_create_cairo((int)w, (int)h, 1.0, /* free_on_destroy */ true);
cairo_t *cairo = (*buffer)->cairo;
cairo_set_source_surface(cairo, image, 0, 0);
cairo_paint_with_alpha(cairo, 1.0);
g_object_unref(svg);
return;
error:
cairo_destroy(cr);
cairo_surface_destroy(image);
wlr_buffer_drop(&(*buffer)->base);
*buffer = NULL;
g_object_unref(svg);
}