mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend-headless: let pixman allocate the image

Browse Source 
No need to manually allocate the storage, Pixman can do that.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2022-07-20 14:47:46 +03:00
committed by Pekka Paalanen
parent 7323ddec62
commit dd706d5953
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-headless/headless.c
+6 -12
View File
@@ -70,7 +70,6 @@ struct headless_output {
struct weston_mode mode; struct weston_mode mode;
struct wl_event_source *finish_frame_timer; struct wl_event_source *finish_frame_timer;
uint32_t *image_buf;
pixman_image_t *image; pixman_image_t *image;
}; };
@@ -165,7 +164,6 @@ headless_output_disable_pixman(struct headless_output *output)
{ {
pixman_renderer_output_destroy(&output->base); pixman_renderer_output_destroy(&output->base);
pixman_image_unref(output->image); pixman_image_unref(output->image);
free(output->image_buf);
} }
static int static int
@@ -237,17 +235,14 @@ headless_output_enable_pixman(struct headless_output *output)
.use_shadow = true, .use_shadow = true,
}; };
output->image_buf = malloc(output->base.current_mode->width * output->image =
output->base.current_mode->height * 4); pixman_image_create_bits_no_clear(PIXMAN_x8r8g8b8,
if (!output->image_buf) output->base.current_mode->width,
output->base.current_mode->height,
NULL, 0);
if (!output->image)
return -1; return -1;
output->image = pixman_image_create_bits(PIXMAN_x8r8g8b8,
output->base.current_mode->width,
output->base.current_mode->height,
output->image_buf,
output->base.current_mode->width * 4);
if (pixman_renderer_output_create(&output->base, &options) < 0) if (pixman_renderer_output_create(&output->base, &options) < 0)
goto err_renderer; goto err_renderer;
@@ -257,7 +252,6 @@ headless_output_enable_pixman(struct headless_output *output)
err_renderer: err_renderer:
pixman_image_unref(output->image); pixman_image_unref(output->image);
free(output->image_buf);
return -1; return -1;
} }