[PATCH RFC 3/4] Implement pixman renderer
Kristian Høgsberg
hoegsberg at gmail.com
Mon Jan 7 06:51:01 PST 2013
On Sun, Jan 06, 2013 at 12:12:42PM +0300, Vasily Khoruzhick wrote:
> Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
> ---
> src/Makefile.am | 1 +
> src/pixman-renderer.c | 378 ++++++++++++++++++++++++++++++++++++++++++++++++++
> src/pixman-renderer.h | 39 ++++++
> 3 files changed, 418 insertions(+)
> create mode 100644 src/pixman-renderer.c
> create mode 100644 src/pixman-renderer.h
This looks very good, there's just a couple of comments on error
handling below.
Kristian
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 2eade1d..14e283e 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -36,6 +36,7 @@ weston_SOURCES = \
> gl-renderer.h \
> gl-renderer.c \
> noop-renderer.c \
> + pixman-renderer.c \
> ../shared/matrix.c \
> ../shared/matrix.h \
> weston-launch.h \
> diff --git a/src/pixman-renderer.c b/src/pixman-renderer.c
> new file mode 100644
> index 0000000..84f68f8
> --- /dev/null
> +++ b/src/pixman-renderer.c
> @@ -0,0 +1,378 @@
> +/*
> + * Copyright © 2012 Intel Corporation
> + * Copyright © 2013 Vasily Khoruzhick <anarsoul at gmail.com>
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and
> + * its documentation for any purpose is hereby granted without fee, provided
> + * that the above copyright notice appear in all copies and that both that
> + * copyright notice and this permission notice appear in supporting
> + * documentation, and that the name of the copyright holders not be used in
> + * advertising or publicity pertaining to distribution of the software
> + * without specific, written prior permission. The copyright holders make
> + * no representations about the suitability of this software for any
> + * purpose. It is provided "as is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
> + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
> + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
> + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
> + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#define _GNU_SOURCE
> +
> +#include <errno.h>
> +#include <stdlib.h>
> +
> +#include "pixman-renderer.h"
> +
> +struct pixman_output_state {
> + pixman_image_t *hw_buffer;
> +};
> +
> +struct pixman_surface_state {
> + pixman_image_t *image;
> + struct weston_buffer_reference buffer_ref;
> +};
> +
> +struct pixman_renderer {
> + struct weston_renderer base;
> +};
> +
> +static inline struct pixman_output_state *
> +get_output_state(struct weston_output *output)
> +{
> + return (struct pixman_output_state *)output->renderer_state;
> +}
> +
> +static inline struct pixman_surface_state *
> +get_surface_state(struct weston_surface *surface)
> +{
> + return (struct pixman_surface_state *)surface->renderer_state;
> +}
> +
> +static inline struct pixman_renderer *
> +get_renderer(struct weston_compositor *ec)
> +{
> + return (struct pixman_renderer *)ec->renderer;
> +}
> +
> +static int
> +pixman_renderer_read_pixels(struct weston_output *output,
> + pixman_format_code_t format, void *pixels,
> + uint32_t x, uint32_t y,
> + uint32_t width, uint32_t height)
> +{
> + struct pixman_output_state *po = get_output_state(output);
> + pixman_image_t *out_buf;
> + uint32_t cur_y;
> +
> + if (!po->hw_buffer)
> + return -ENODEV;
We follow the libc convention of returning -1 (for int returning
functions) or NULL (for pointer returning functions) and setting errno
accordingly. Unless errno is already set by a failing libc call.
> + out_buf = pixman_image_create_bits(format,
> + width,
> + height,
> + pixels,
> + (PIXMAN_FORMAT_BPP(format) / 8) * width);
> +
> + /* Caller expects vflipped image */
> + for (cur_y = y; cur_y < y + height; cur_y++) {
> + pixman_image_composite32(PIXMAN_OP_SRC,
> + po->hw_buffer, /* src */
> + NULL /* mask */,
> + out_buf, /* dest */
> + x, cur_y, /* src_x, src_y */
> + 0, 0, /* mask_x, mask_y */
> + 0, height - (cur_y - y), /* dest_x, dest_y */
> + width, /* width */
> + 1 /* height */);
> + }
> +
> + pixman_image_unref(out_buf);
> +
> + return 0;
> +}
> +
> +static void
> +repaint_region(struct weston_surface *es, struct weston_output *output,
> + pixman_region32_t *region, pixman_region32_t *surf_region,
> + pixman_op_t pixman_op)
> +{
> + struct pixman_surface_state *ps = get_surface_state(es);
> + struct pixman_output_state *po = get_output_state(output);
> + pixman_region32_t final_region;
> + pixman_box32_t *rects;
> + int nrects, i, src_x, src_y;
> + float surface_x, surface_y;
> +
> + /* The final region to be painted is the intersection of
> + * 'region' and 'surf_region'. However, 'region' is in the global
> + * coordinates, and 'surf_region' is in the surface-local
> + * coordinates
> + */
> + pixman_region32_init(&final_region);
> + pixman_region32_copy(&final_region, surf_region);
> +
> + if (es->transform.enabled) {
> + weston_surface_to_global_float(es, 0, 0, &surface_x, &surface_y);
> + pixman_region32_translate(&final_region, (int)surface_x, (int)surface_y);
> + } else
> + pixman_region32_translate(&final_region, es->geometry.x, es->geometry.y);
> +
> + /* That's what we need to paint */
> + pixman_region32_intersect(&final_region, &final_region, region);
> +
> + rects = pixman_region32_rectangles(&final_region, &nrects);
> +
> + for (i = 0; i < nrects; i++) {
> + weston_surface_from_global(es, rects[i].x1, rects[i].y1, &src_x, &src_y);
> + pixman_image_composite32(pixman_op,
> + ps->image, /* src */
> + NULL /* mask */,
> + po->hw_buffer, /* dest */
> + src_x, src_y, /* src_x, src_y */
> + 0, 0, /* mask_x, mask_y */
> + rects[i].x1, rects[i].y1, /* dest_x, dest_y */
> + rects[i].x2 - rects[i].x1, /* width */
> + rects[i].y2 - rects[i].y1 /* height */);
> + }
> + pixman_region32_fini(&final_region);
> +}
> +
> +static void
> +draw_surface(struct weston_surface *es, struct weston_output *output,
> + pixman_region32_t *damage) /* in global coordinates */
> +{
> + struct pixman_surface_state *ps = get_surface_state(es);
> + /* repaint bounding region in global coordinates: */
> + pixman_region32_t repaint;
> + /* non-opaque region in surface coordinates: */
> + pixman_region32_t surface_blend;
> +
> + /* No buffer attached */
> + if (!ps->image)
> + return;
> +
> + pixman_region32_init(&repaint);
> + pixman_region32_intersect(&repaint,
> + &es->transform.boundingbox, damage);
> + pixman_region32_subtract(&repaint, &repaint, &es->clip);
> +
> + if (!pixman_region32_not_empty(&repaint))
> + goto out;
> +
> + if (output->zoom.active) {
> + weston_log("pixman renderer does not support zoom\n");
> + goto out;
> + }
> +
> + /* blended region is whole surface minus opaque region: */
> + pixman_region32_init_rect(&surface_blend, 0, 0,
> + es->geometry.width, es->geometry.height);
> + pixman_region32_subtract(&surface_blend, &surface_blend, &es->opaque);
> +
> + if (pixman_region32_not_empty(&es->opaque)) {
> + repaint_region(es, output, &repaint, &es->opaque, PIXMAN_OP_SRC);
> + }
> +
> + if (pixman_region32_not_empty(&surface_blend)) {
> + repaint_region(es, output, &repaint, &surface_blend, PIXMAN_OP_OVER);
> + }
> +
> + pixman_region32_fini(&surface_blend);
> +
> +out:
> + pixman_region32_fini(&repaint);
> +}
> +static void
> +repaint_surfaces(struct weston_output *output, pixman_region32_t *damage)
> +{
> + struct weston_compositor *compositor = output->compositor;
> + struct weston_surface *surface;
> +
> + wl_list_for_each_reverse(surface, &compositor->surface_list, link)
> + if (surface->plane == &compositor->primary_plane)
> + draw_surface(surface, output, damage);
> +}
> +
> +static void
> +pixman_renderer_repaint_output(struct weston_output *output,
> + pixman_region32_t *output_damage)
> +{
> + struct pixman_output_state *po = get_output_state(output);
> +
> + if (!po->hw_buffer)
> + return;
> +
> + repaint_surfaces(output, output_damage);
> +
> + pixman_region32_copy(&output->previous_damage, output_damage);
> + wl_signal_emit(&output->frame_signal, output);
> +
> + /* Actual flip should be done by caller */
> +}
> +
> +static void
> +pixman_renderer_flush_damage(struct weston_surface *surface)
> +{
> + /* No-op for pixman renderer */
> +}
> +
> +static void
> +pixman_renderer_attach(struct weston_surface *es, struct wl_buffer *buffer)
> +{
> + struct pixman_surface_state *ps = get_surface_state(es);
> + pixman_format_code_t pixman_format;
> +
> + weston_buffer_reference(&ps->buffer_ref, buffer);
> +
> + if (ps->image) {
> + pixman_image_unref(ps->image);
> + ps->image = NULL;
> + }
> +
> + if (!buffer)
> + return;
> +
> + if (!wl_buffer_is_shm(buffer)) {
> + weston_log("Pixman renderer supports only SHM buffers\n");
> + weston_buffer_reference(&ps->buffer_ref, NULL);
> + return;
> + }
> +
> + switch (wl_shm_buffer_get_format(buffer)) {
> + case WL_SHM_FORMAT_XRGB8888:
> + pixman_format = PIXMAN_x8r8g8b8;
> + break;
> + case WL_SHM_FORMAT_ARGB8888:
> + pixman_format = PIXMAN_a8r8g8b8;
> + break;
> + default:
> + weston_log("Unsupported SHM buffer format\n");
> + weston_buffer_reference(&ps->buffer_ref, NULL);
> + return;
> + break;
> + }
> + ps->image = pixman_image_create_bits(pixman_format,
> + wl_shm_buffer_get_width(buffer),
> + wl_shm_buffer_get_height(buffer),
> + wl_shm_buffer_get_data(buffer),
> + wl_shm_buffer_get_stride(buffer));
> +}
> +
> +static int
> +pixman_renderer_create_surface(struct weston_surface *surface)
> +{
> + struct pixman_surface_state *ps;
> +
> + ps = calloc(1, sizeof *ps);
> + if (!ps)
> + return -ENOMEM;
As above, return -1 here. If calloc fails, errno is already set to
ENOMEM.
> + surface->renderer_state = ps;
> +
> + return 0;
> +}
> +
> +static void
> +pixman_renderer_surface_set_color(struct weston_surface *es,
> + float red, float green, float blue, float alpha)
> +{
> + struct pixman_surface_state *ps = get_surface_state(es);
> + pixman_color_t color;
> +
> + color.red = red * 0xffff;
> + color.green = green * 0xffff;
> + color.blue = blue * 0xffff;
> + color.alpha = alpha * 0xffff;
> +
> + if (ps->image) {
> + pixman_image_unref(ps->image);
> + ps->image = NULL;
> + }
> +
> + ps->image = pixman_image_create_solid_fill(&color);
> +}
> +
> +static void
> +pixman_renderer_destroy_surface(struct weston_surface *surface)
> +{
> + struct pixman_surface_state *ps = get_surface_state(surface);
> +
> + if (ps->image) {
> + pixman_image_unref(ps->image);
> + ps->image = NULL;
> + }
> + weston_buffer_reference(&ps->buffer_ref, NULL);
> + free(ps);
> +}
> +
> +WL_EXPORT void
> +pixman_renderer_destroy(struct weston_compositor *ec)
> +{
> + free(ec->renderer);
> + ec->renderer = NULL;
> +}
> +
> +WL_EXPORT int
> +pixman_renderer_init(struct weston_compositor *ec)
> +{
> + struct weston_renderer *renderer;
> +
> + renderer = malloc(sizeof *renderer);
> + if (renderer == NULL)
> + return -1;
> +
> + renderer->read_pixels = pixman_renderer_read_pixels;
> + renderer->repaint_output = pixman_renderer_repaint_output;
> + renderer->flush_damage = pixman_renderer_flush_damage;
> + renderer->attach = pixman_renderer_attach;
> + renderer->create_surface = pixman_renderer_create_surface;
> + renderer->surface_set_color = pixman_renderer_surface_set_color;
> + renderer->destroy_surface = pixman_renderer_destroy_surface;
> + ec->renderer = renderer;
> +
> + return 0;
> +}
> +
> +WL_EXPORT void
> +pixman_renderer_output_set_buffer(struct weston_output *output, pixman_image_t *buffer)
> +{
> + struct pixman_output_state *po = get_output_state(output);
> +
> + if (po->hw_buffer)
> + pixman_image_unref(po->hw_buffer);
> + po->hw_buffer = buffer;
> +
> + if (po->hw_buffer) {
> + output->compositor->read_format = pixman_image_get_format(po->hw_buffer);
> + pixman_image_ref(po->hw_buffer);
> + }
> +}
> +
> +WL_EXPORT int
> +pixman_renderer_output_create(struct weston_output *output)
> +{
> + struct pixman_output_state *po = calloc(1, sizeof *po);
> +
> + if (!po)
> + return -ENOMEM;
Same here.
> +
> + output->renderer_state = po;
> +
> + return 0;
> +}
> +
> +WL_EXPORT void
> +pixman_renderer_output_destroy(struct weston_output *output)
> +{
> + struct pixman_output_state *po = get_output_state(output);
> +
> + pixman_image_unref(po->hw_buffer);
> + po->hw_buffer = NULL;
> +
> + free(po);
> +}
> diff --git a/src/pixman-renderer.h b/src/pixman-renderer.h
> new file mode 100644
> index 0000000..1df0d89
> --- /dev/null
> +++ b/src/pixman-renderer.h
> @@ -0,0 +1,39 @@
> +/*
> + * Copyright © 2013 Vasily Khoruzhick <anarsoul at gmail.com>
> + *
> + * Permission to use, copy, modify, distribute, and sell this software and
> + * its documentation for any purpose is hereby granted without fee, provided
> + * that the above copyright notice appear in all copies and that both that
> + * copyright notice and this permission notice appear in supporting
> + * documentation, and that the name of the copyright holders not be used in
> + * advertising or publicity pertaining to distribution of the software
> + * without specific, written prior permission. The copyright holders make
> + * no representations about the suitability of this software for any
> + * purpose. It is provided "as is" without express or implied warranty.
> + *
> + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
> + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
> + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
> + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
> + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
> + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
> + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include "compositor.h"
> +
> +void
> +pixman_renderer_destroy(struct weston_compositor *ec);
> +
> +
> +int
> +pixman_renderer_init(struct weston_compositor *ec);
> +
> +int
> +pixman_renderer_output_create(struct weston_output *output);
> +
> +void
> +pixman_renderer_output_set_buffer(struct weston_output *output, pixman_image_t *buffer);
> +
> +void
> +pixman_renderer_output_destroy(struct weston_output *output);
> --
> 1.8.1
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
More information about the wayland-devel
mailing list