diff options
| -rw-r--r-- | include/render/pixman.h | 11 | ||||
| -rw-r--r-- | render/pixman/meson.build | 1 | ||||
| -rw-r--r-- | render/pixman/pass.c | 181 | ||||
| -rw-r--r-- | render/pixman/renderer.c | 20 |
4 files changed, 212 insertions, 1 deletions
diff --git a/include/render/pixman.h b/include/render/pixman.h index 417964f2..24a27055 100644 --- a/include/render/pixman.h +++ b/include/render/pixman.h @@ -1,9 +1,10 @@ #ifndef RENDER_PIXMAN_H #define RENDER_PIXMAN_H +#include <wlr/render/drm_format_set.h> +#include <wlr/render/interface.h> #include <wlr/render/pixman.h> #include <wlr/render/wlr_renderer.h> -#include <wlr/render/drm_format_set.h> #include "render/pixel_format.h" struct wlr_pixman_pixel_format { @@ -48,6 +49,11 @@ struct wlr_pixman_texture { struct wlr_buffer *buffer; // if created via texture_from_buffer }; +struct wlr_pixman_render_pass { + struct wlr_render_pass base; + struct wlr_pixman_buffer *buffer; +}; + pixman_format_code_t get_pixman_format_from_drm(uint32_t fmt); uint32_t get_drm_format_from_pixman(pixman_format_code_t fmt); const uint32_t *get_pixman_drm_formats(size_t *len); @@ -55,4 +61,7 @@ const uint32_t *get_pixman_drm_formats(size_t *len); bool begin_pixman_data_ptr_access(struct wlr_buffer *buffer, pixman_image_t **image_ptr, uint32_t flags); +struct wlr_pixman_render_pass *begin_pixman_render_pass( + struct wlr_pixman_buffer *buffer); + #endif diff --git a/render/pixman/meson.build b/render/pixman/meson.build index 484cda46..c8fb875c 100644 --- a/render/pixman/meson.build +++ b/render/pixman/meson.build @@ -3,6 +3,7 @@ pixman = dependency('pixman-1') wlr_deps += pixman wlr_files += files( + 'pass.c', 'pixel_format.c', 'renderer.c', ) diff --git a/render/pixman/pass.c b/render/pixman/pass.c new file mode 100644 index 00000000..69d5e5e0 --- /dev/null +++ b/render/pixman/pass.c @@ -0,0 +1,181 @@ +#include <assert.h> +#include <stdlib.h> +#include "render/pixman.h" + +static const struct wlr_render_pass_impl render_pass_impl; + +static struct wlr_pixman_render_pass *get_render_pass(struct wlr_render_pass *wlr_pass) { + assert(wlr_pass->impl == &render_pass_impl); + struct wlr_pixman_render_pass *pass = wl_container_of(wlr_pass, pass, base); + return pass; +} + +static struct wlr_pixman_texture *get_texture(struct wlr_texture *wlr_texture) { + assert(wlr_texture_is_pixman(wlr_texture)); + struct wlr_pixman_texture *texture = wl_container_of(wlr_texture, texture, wlr_texture); + return texture; +} + +static bool render_pass_submit(struct wlr_render_pass *wlr_pass) { + struct wlr_pixman_render_pass *pass = get_render_pass(wlr_pass); + + wlr_buffer_end_data_ptr_access(pass->buffer->buffer); + wlr_buffer_unlock(pass->buffer->buffer); + free(pass); + + return true; +} + +static void render_pass_add_texture(struct wlr_render_pass *wlr_pass, + const struct wlr_render_texture_options *options) { + struct wlr_pixman_render_pass *pass = get_render_pass(wlr_pass); + struct wlr_pixman_texture *texture = get_texture(options->texture); + struct wlr_pixman_buffer *buffer = pass->buffer; + struct wlr_box dst_box = options->dst_box; + + if (texture->buffer != NULL && !begin_pixman_data_ptr_access(texture->buffer, + &texture->image, WLR_BUFFER_DATA_PTR_ACCESS_READ)) { + return; + } + + struct wlr_fbox src_fbox; + wlr_render_texture_options_get_src_box(options, &src_fbox); + struct wlr_box src_box = { + .x = roundf(src_fbox.x), + .y = roundf(src_fbox.y), + .width = roundf(src_fbox.width), + .height = roundf(src_fbox.height), + }; + + pixman_image_t *mask = NULL; + float alpha = wlr_render_texture_options_get_alpha(options); + if (alpha != 1) { + mask = pixman_image_create_solid_fill(&(struct pixman_color){ + .alpha = 0xFFFF * alpha, + }); + } + + int32_t dest_x, dest_y, width, height; + if (options->transform != WL_OUTPUT_TRANSFORM_NORMAL) { + // Cosinus/sinus values are extact integers for enum wl_output_transform entries + int tr_cos = 1, tr_sin = 0, tr_x = 0, tr_y = 0; + switch (options->transform) { + case WL_OUTPUT_TRANSFORM_NORMAL: + case WL_OUTPUT_TRANSFORM_FLIPPED: + break; + case WL_OUTPUT_TRANSFORM_90: + case WL_OUTPUT_TRANSFORM_FLIPPED_90: + tr_cos = 0; + tr_sin = 1; + tr_x = buffer->buffer->height; + break; + case WL_OUTPUT_TRANSFORM_180: + case WL_OUTPUT_TRANSFORM_FLIPPED_180: + tr_cos = -1; + tr_sin = 0; + tr_x = buffer->buffer->width; + tr_y = buffer->buffer->height; + break; + case WL_OUTPUT_TRANSFORM_270: + case WL_OUTPUT_TRANSFORM_FLIPPED_270: + tr_cos = 0; + tr_sin = -1; + tr_y = buffer->buffer->width; + break; + } + + struct wlr_box orig_box; + wlr_box_transform(&orig_box, &dst_box, options->transform, + buffer->buffer->width, buffer->buffer->height); + + struct pixman_transform transform; + pixman_transform_init_identity(&transform); + pixman_transform_rotate(&transform, NULL, + pixman_int_to_fixed(tr_cos), pixman_int_to_fixed(tr_sin)); + if (options->transform >= WL_OUTPUT_TRANSFORM_FLIPPED) { + pixman_transform_scale(&transform, NULL, + pixman_int_to_fixed(-1), pixman_int_to_fixed(1)); + } + pixman_transform_translate(&transform, NULL, + pixman_int_to_fixed(tr_x), pixman_int_to_fixed(tr_y)); + pixman_transform_translate(&transform, NULL, + -pixman_int_to_fixed(orig_box.x), -pixman_int_to_fixed(orig_box.y)); + pixman_image_set_transform(texture->image, &transform); + + dest_x = dest_y = 0; + width = buffer->buffer->width; + height = buffer->buffer->height; + } else { + pixman_image_set_transform(texture->image, NULL); + dest_x = dst_box.x; + dest_y = dst_box.y; + width = src_box.width; + height = src_box.height; + } + + pixman_image_set_clip_region32(buffer->image, (pixman_region32_t *)options->clip); + pixman_image_composite32(PIXMAN_OP_OVER, texture->image, mask, + buffer->image, src_box.x, src_box.y, 0, 0, dest_x, dest_y, + width, height); + pixman_image_set_clip_region32(buffer->image, NULL); + + pixman_image_set_transform(texture->image, NULL); + + if (texture->buffer != NULL) { + wlr_buffer_end_data_ptr_access(texture->buffer); + } + + if (mask != NULL) { + pixman_image_unref(mask); + } +} + +static void render_pass_add_rect(struct wlr_render_pass *wlr_pass, + const struct wlr_render_rect_options *options) { + struct wlr_pixman_render_pass *pass = get_render_pass(wlr_pass); + struct wlr_pixman_buffer *buffer = pass->buffer; + struct wlr_box box = options->box; + + struct pixman_color color = { + .red = options->color.r * 0xFFFF, + .green = options->color.g * 0xFFFF, + .blue = options->color.b * 0xFFFF, + .alpha = options->color.a * 0xFFFF, + }; + + pixman_image_t *fill = pixman_image_create_solid_fill(&color); + + pixman_image_set_clip_region32(buffer->image, (pixman_region32_t *)options->clip); + pixman_image_composite32(PIXMAN_OP_OVER, fill, NULL, buffer->image, + 0, 0, 0, 0, box.x, box.y, box.width, box.height); + pixman_image_set_clip_region32(buffer->image, NULL); + + pixman_image_unref(fill); +} + +static const struct wlr_render_pass_impl render_pass_impl = { + .submit = render_pass_submit, + .add_texture = render_pass_add_texture, + .add_rect = render_pass_add_rect, +}; + +struct wlr_pixman_render_pass *begin_pixman_render_pass( + struct wlr_pixman_buffer *buffer) { + struct wlr_pixman_render_pass *pass = calloc(1, sizeof(*pass)); + if (pass == NULL) { + return NULL; + } + + wlr_render_pass_init(&pass->base, &render_pass_impl); + + if (!begin_pixman_data_ptr_access(buffer->buffer, &buffer->image, + WLR_BUFFER_DATA_PTR_ACCESS_READ | WLR_BUFFER_DATA_PTR_ACCESS_WRITE)) { + free(pass); + return NULL; + } + + wlr_buffer_lock(buffer->buffer); + pass->buffer = buffer; + + return pass; +} diff --git a/render/pixman/renderer.c b/render/pixman/renderer.c index 005f748c..2ada4cdb 100644 --- a/render/pixman/renderer.c +++ b/render/pixman/renderer.c @@ -493,6 +493,25 @@ static uint32_t pixman_get_render_buffer_caps(struct wlr_renderer *renderer) { return WLR_BUFFER_CAP_DATA_PTR; } +static struct wlr_render_pass *pixman_begin_buffer_pass(struct wlr_renderer *wlr_renderer, + struct wlr_buffer *wlr_buffer) { + struct wlr_pixman_renderer *renderer = get_renderer(wlr_renderer); + + struct wlr_pixman_buffer *buffer = get_buffer(renderer, wlr_buffer); + if (buffer == NULL) { + buffer = create_buffer(renderer, wlr_buffer); + } + if (buffer == NULL) { + return NULL; + } + + struct wlr_pixman_render_pass *pass = begin_pixman_render_pass(buffer); + if (pass == NULL) { + return NULL; + } + return &pass->base; +} + static const struct wlr_renderer_impl renderer_impl = { .begin = pixman_begin, .end = pixman_end, @@ -508,6 +527,7 @@ static const struct wlr_renderer_impl renderer_impl = { .preferred_read_format = pixman_preferred_read_format, .read_pixels = pixman_read_pixels, .get_render_buffer_caps = pixman_get_render_buffer_caps, + .begin_buffer_pass = pixman_begin_buffer_pass, }; struct wlr_renderer *wlr_pixman_renderer_create(void) { |