mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-06 01:40:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/pass: accept fractional destination coordinates

Browse source 
Signed-off-by: Loukas Agorgianitis <loukas@agorgianitis.com>
This commit is contained in:
Loukas Agorgianitis 2025-12-08 11:47:15 +02:00
parent 91c08d5a53
commit 5a49f2ae14
No known key found for this signature in database
GPG key ID: DDC6FA7D5BB332E6
13 changed files with 79 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

7
examples/output-layout.c
View file

@ -136,7 +136,12 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
wlr_render_pass_add_texture(pass, &(struct wlr_render_texture_options){ wlr_render_pass_add_texture(pass, &(struct wlr_render_texture_options){
.texture = sample->cat_texture, .texture = sample->cat_texture,
.dst_box = box, .dst_box = (struct wlr_fbox){
.x = box.x,
.y = box.y,
.width = box.width,
.height = box.height,
},
}); });
} }

2
examples/tablet.c
View file

@ -123,7 +123,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
}); });
if (sample->proximity) { if (sample->proximity) {
struct wlr_box box = { struct wlr_fbox box = {
.x = (sample->x * pad_width) - 8 * (sample->pressure + 1) + left, .x = (sample->x * pad_width) - 8 * (sample->pressure + 1) + left,
.y = (sample->y * pad_height) - 8 * (sample->pressure + 1) + top, .y = (sample->y * pad_height) - 8 * (sample->pressure + 1) + top,
.width = 16 * (sample->pressure + 1), .width = 16 * (sample->pressure + 1),

3
include/util/matrix.h
View file

@ -4,6 +4,7 @@
#include <wayland-server-protocol.h> #include <wayland-server-protocol.h>
struct wlr_box; struct wlr_box;
struct wlr_fbox;
/** Writes the identity matrix into mat */ /** Writes the identity matrix into mat */
void wlr_matrix_identity(float mat[static 9]); void wlr_matrix_identity(float mat[static 9]);
@ -27,7 +28,7 @@ void wlr_matrix_transform(float mat[static 9],
* specified wlr_box onto a given orthographic projection with a given * specified wlr_box onto a given orthographic projection with a given
* rotation. The result is written to mat, which can be applied to each * rotation. The result is written to mat, which can be applied to each
* coordinate of the box to get a new coordinate from [-1,1]. */ * coordinate of the box to get a new coordinate from [-1,1]. */
void wlr_matrix_project_box(float mat[static 9], const struct wlr_box *box, void wlr_matrix_project_box(float mat[static 9], const struct wlr_fbox *box,
enum wl_output_transform transform, const float projection[static 9]); enum wl_output_transform transform, const float projection[static 9]);
/** /**

4
include/wlr/render/interface.h
View file

@ -76,10 +76,10 @@ struct wlr_render_timer_impl {
void wlr_render_texture_options_get_src_box(const struct wlr_render_texture_options *options, void wlr_render_texture_options_get_src_box(const struct wlr_render_texture_options *options,
struct wlr_fbox *box); struct wlr_fbox *box);
void wlr_render_texture_options_get_dst_box(const struct wlr_render_texture_options *options, void wlr_render_texture_options_get_dst_box(const struct wlr_render_texture_options *options,
struct wlr_box *box); struct wlr_fbox *box);
float wlr_render_texture_options_get_alpha(const struct wlr_render_texture_options *options); float wlr_render_texture_options_get_alpha(const struct wlr_render_texture_options *options);
void wlr_render_rect_options_get_box(const struct wlr_render_rect_options *options, void wlr_render_rect_options_get_box(const struct wlr_render_rect_options *options,
const struct wlr_buffer *buffer, struct wlr_box *box); const struct wlr_buffer *buffer, struct wlr_fbox *box);
void wlr_texture_read_pixels_options_get_src_box( void wlr_texture_read_pixels_options_get_src_box(
const struct wlr_texture_read_pixels_options *options, const struct wlr_texture_read_pixels_options *options,

4
include/wlr/render/pass.h
View file

@ -90,7 +90,7 @@ struct wlr_render_texture_options {
/* Source coordinates, leave empty to render the whole texture */ /* Source coordinates, leave empty to render the whole texture */
struct wlr_fbox src_box; struct wlr_fbox src_box;
/* Destination coordinates, width/height default to the texture size */ /* Destination coordinates, width/height default to the texture size */
struct wlr_box dst_box; struct wlr_fbox dst_box;
/* Opacity between 0 (transparent) and 1 (opaque), leave NULL for opaque */ /* Opacity between 0 (transparent) and 1 (opaque), leave NULL for opaque */
const float *alpha; const float *alpha;
/* Clip region, leave NULL to disable clipping */ /* Clip region, leave NULL to disable clipping */
@ -140,7 +140,7 @@ struct wlr_render_color {
struct wlr_render_rect_options { struct wlr_render_rect_options {
/* Rectangle coordinates */ /* Rectangle coordinates */
struct wlr_box box; struct wlr_fbox box;
/* Source color */ /* Source color */
struct wlr_render_color color; struct wlr_render_color color;
/* Clip region, leave NULL to disable clipping */ /* Clip region, leave NULL to disable clipping */

24
render/gles2/pass.c
View file

@ -75,9 +75,9 @@ out:
return ok; return ok;
} }
static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLint attrib) { static void render(const struct wlr_fbox *box, const pixman_region32_t *clip, GLint attrib) {
pixman_region32_t region; pixman_region32_t region;
pixman_region32_init_rect(&region, box->x, box->y, box->width, box->height); pixman_region32_init_rect(&region, round(box->x), round(box->y), round(box->width), round(box->height));
if (clip) { if (clip) {
pixman_region32_intersect(&region, &region, clip); pixman_region32_intersect(&region, &region, clip);
@ -124,7 +124,7 @@ static void render(const struct wlr_box *box, const pixman_region32_t *clip, GLi
pixman_region32_fini(&region); pixman_region32_fini(&region);
} }
static void set_proj_matrix(GLint loc, float proj[9], const struct wlr_box *box) { static void set_proj_matrix(GLint loc, float proj[9], const struct wlr_fbox *box) {
float gl_matrix[9]; float gl_matrix[9];
wlr_matrix_identity(gl_matrix); wlr_matrix_identity(gl_matrix);
wlr_matrix_translate(gl_matrix, box->x, box->y); wlr_matrix_translate(gl_matrix, box->x, box->y);
@ -190,16 +190,16 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
abort(); abort();
} }
struct wlr_box dst_box; struct wlr_fbox dst_box;
struct wlr_fbox src_fbox; struct wlr_fbox src_box;
wlr_render_texture_options_get_src_box(options, &src_fbox); wlr_render_texture_options_get_src_box(options, &src_box);
wlr_render_texture_options_get_dst_box(options, &dst_box); wlr_render_texture_options_get_dst_box(options, &dst_box);
float alpha = wlr_render_texture_options_get_alpha(options); float alpha = wlr_render_texture_options_get_alpha(options);
src_fbox.x /= options->texture->width; src_box.x /= options->texture->width;
src_fbox.y /= options->texture->height; src_box.y /= options->texture->height;
src_fbox.width /= options->texture->width; src_box.width /= options->texture->width;
src_fbox.height /= options->texture->height; src_box.height /= options->texture->height;
push_gles2_debug(renderer); push_gles2_debug(renderer);
@ -245,7 +245,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
glUniform1i(shader->tex, 0); glUniform1i(shader->tex, 0);
glUniform1f(shader->alpha, alpha); glUniform1f(shader->alpha, alpha);
set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box); set_proj_matrix(shader->proj, pass->projection_matrix, &dst_box);
set_tex_matrix(shader->tex_proj, options->transform, &src_fbox); set_tex_matrix(shader->tex_proj, options->transform, &src_box);
render(&dst_box, options->clip, shader->pos_attrib); render(&dst_box, options->clip, shader->pos_attrib);
@ -259,7 +259,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
struct wlr_gles2_renderer *renderer = pass->buffer->renderer; struct wlr_gles2_renderer *renderer = pass->buffer->renderer;
const struct wlr_render_color *color = &options->color; const struct wlr_render_color *color = &options->color;
struct wlr_box box; struct wlr_fbox box;
wlr_render_rect_options_get_box(options, pass->buffer->buffer, &box); wlr_render_rect_options_get_box(options, pass->buffer->buffer, &box);
push_gles2_debug(renderer); push_gles2_debug(renderer);

10
render/pass.c
View file

@ -46,9 +46,9 @@ void wlr_render_texture_options_get_src_box(const struct wlr_render_texture_opti
} }
void wlr_render_texture_options_get_dst_box(const struct wlr_render_texture_options *options, void wlr_render_texture_options_get_dst_box(const struct wlr_render_texture_options *options,
struct wlr_box *box) { struct wlr_fbox *box) {
*box = options->dst_box; *box = options->dst_box;
if (wlr_box_empty(box)) { if (wlr_fbox_empty(box)) {
box->width = options->texture->width; box->width = options->texture->width;
box->height = options->texture->height; box->height = options->texture->height;
} }
@ -62,9 +62,9 @@ float wlr_render_texture_options_get_alpha(const struct wlr_render_texture_optio
} }
void wlr_render_rect_options_get_box(const struct wlr_render_rect_options *options, void wlr_render_rect_options_get_box(const struct wlr_render_rect_options *options,
const struct wlr_buffer *buffer, struct wlr_box *box) { const struct wlr_buffer *buffer, struct wlr_fbox *box) {
if (wlr_box_empty(&options->box)) { if (wlr_fbox_empty(&options->box)) {
*box = (struct wlr_box){ *box = (struct wlr_fbox){
.width = buffer->width, .width = buffer->width,
.height = buffer->height, .height = buffer->height,
}; };

14
render/pixman/pass.c
View file

@ -59,7 +59,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
.height = roundf(src_fbox.height), .height = roundf(src_fbox.height),
}; };
struct wlr_box dst_box; struct wlr_fbox dst_box;
wlr_render_texture_options_get_dst_box(options, &dst_box); wlr_render_texture_options_get_dst_box(options, &dst_box);
pixman_image_t *mask = NULL; pixman_image_t *mask = NULL;
@ -125,8 +125,8 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
// it depends on the whether the rotation swapped width and height, which is why // it depends on the whether the rotation swapped width and height, which is why
// we use src_box_transformed instead of src_box. // we use src_box_transformed instead of src_box.
pixman_transform_scale(&transform, NULL, pixman_transform_scale(&transform, NULL,
pixman_double_to_fixed(src_box_transformed.width / (double)dst_box.width), pixman_double_to_fixed(src_box_transformed.width / dst_box.width),
pixman_double_to_fixed(src_box_transformed.height / (double)dst_box.height)); pixman_double_to_fixed(src_box_transformed.height / dst_box.height));
// pixman rotates about the origin which again leaves everything outside of the // pixman rotates about the origin which again leaves everything outside of the
// viewport. Translate the result so that its new top-left corner is back at the // viewport. Translate the result so that its new top-left corner is back at the
@ -174,8 +174,8 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
pixman_image_composite32(op, texture->image, mask, buffer->image, pixman_image_composite32(op, texture->image, mask, buffer->image,
0, 0, // source x,y 0, 0, // source x,y
0, 0, // mask x,y 0, 0, // mask x,y
dst_box.x, dst_box.y, // dest x,y round(dst_box.x), round(dst_box.y), // dest x,y
dst_box.width, dst_box.height // composite width,height round(dst_box.width), round(dst_box.height) // composite width,height
); );
pixman_image_set_transform(texture->image, NULL); pixman_image_set_transform(texture->image, NULL);
@ -183,7 +183,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
// No transforms or crop needed, just a straight blit from the source // No transforms or crop needed, just a straight blit from the source
pixman_image_set_transform(texture->image, NULL); pixman_image_set_transform(texture->image, NULL);
pixman_image_composite32(op, texture->image, mask, buffer->image, pixman_image_composite32(op, texture->image, mask, buffer->image,
src_box.x, src_box.y, 0, 0, dst_box.x, dst_box.y, src_box.x, src_box.y, 0, 0, round(dst_box.x), round(dst_box.y),
src_box.width, src_box.height); src_box.width, src_box.height);
} }
@ -202,7 +202,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
const struct wlr_render_rect_options *options) { const struct wlr_render_rect_options *options) {
struct wlr_pixman_render_pass *pass = get_render_pass(wlr_pass); struct wlr_pixman_render_pass *pass = get_render_pass(wlr_pass);
struct wlr_pixman_buffer *buffer = pass->buffer; struct wlr_pixman_buffer *buffer = pass->buffer;
struct wlr_box box; struct wlr_fbox box;
wlr_render_rect_options_get_box(options, pass->buffer->buffer, &box); wlr_render_rect_options_get_box(options, pass->buffer->buffer, &box);
pixman_op_t op = get_pixman_blending(options->color.a == 1 ? pixman_op_t op = get_pixman_blending(options->color.a == 1 ?

20
render/vulkan/pass.c
View file

@ -686,14 +686,20 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
.width = clip_rects[i].x2 - clip_rects[i].x1, .width = clip_rects[i].x2 - clip_rects[i].x1,
.height = clip_rects[i].y2 - clip_rects[i].y1, .height = clip_rects[i].y2 - clip_rects[i].y1,
}; };
struct wlr_box rect_box = {
.x = round(options->box.x),
.y = round(options->box.y),
.width = round(options->box.width),
.height = round(options->box.height),
};
struct wlr_box intersection; struct wlr_box intersection;
if (!wlr_box_intersection(&intersection, &options->box, &clip_box)) { if (!wlr_box_intersection(&intersection, &rect_box, &clip_box)) {
continue; continue;
} }
render_pass_mark_box_updated(pass, &intersection); render_pass_mark_box_updated(pass, &intersection);
} }
struct wlr_box box; struct wlr_fbox box;
wlr_render_rect_options_get_box(options, pass->render_buffer->wlr_buffer, &box); wlr_render_rect_options_get_box(options, pass->render_buffer->wlr_buffer, &box);
switch (options->blend_mode) { switch (options->blend_mode) {
@ -782,7 +788,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
struct wlr_fbox src_box; struct wlr_fbox src_box;
wlr_render_texture_options_get_src_box(options, &src_box); wlr_render_texture_options_get_src_box(options, &src_box);
struct wlr_box dst_box; struct wlr_fbox dst_box;
wlr_render_texture_options_get_dst_box(options, &dst_box); wlr_render_texture_options_get_dst_box(options, &dst_box);
float alpha = wlr_render_texture_options_get_alpha(options); float alpha = wlr_render_texture_options_get_alpha(options);
@ -926,8 +932,14 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
.width = clip_rects[i].x2 - clip_rects[i].x1, .width = clip_rects[i].x2 - clip_rects[i].x1,
.height = clip_rects[i].y2 - clip_rects[i].y1, .height = clip_rects[i].y2 - clip_rects[i].y1,
}; };
struct wlr_box texture_box = {
.x = round(dst_box.x),
.y = round(dst_box.y),
.width = round(dst_box.width),
.height = round(dst_box.height),
};
struct wlr_box intersection; struct wlr_box intersection;
if (!wlr_box_intersection(&intersection, &dst_box, &clip_box)) { if (!wlr_box_intersection(&intersection, &texture_box, &clip_box)) {
continue; continue;
} }
render_pass_mark_box_updated(pass, &intersection); render_pass_mark_box_updated(pass, &intersection);

13
types/output/cursor.c
View file

@ -122,10 +122,17 @@ void wlr_output_add_software_cursors_to_render_pass(struct wlr_output *output,
continue; continue;
} }
struct wlr_fbox dst_box = (struct wlr_fbox){
.x = box.x,
.y = box.y,
.width = box.width,
.height = box.height,
};
wlr_render_pass_add_texture(render_pass, &(struct wlr_render_texture_options) { wlr_render_pass_add_texture(render_pass, &(struct wlr_render_texture_options) {
.texture = texture, .texture = texture,
.src_box = cursor->src_box, .src_box = cursor->src_box,
.dst_box = box, .dst_box = dst_box,
.clip = &cursor_damage, .clip = &cursor_damage,
.transform = output->transform, .transform = output->transform,
}); });
@ -249,11 +256,11 @@ static struct wlr_buffer *render_cursor_buffer(struct wlr_output_cursor *cursor)
return NULL; return NULL;
} }
struct wlr_box dst_box = { struct wlr_fbox dst_box = {
.width = cursor->width, .width = cursor->width,
.height = cursor->height, .height = cursor->height,
}; };
wlr_box_transform(&dst_box, &dst_box, wlr_output_transform_invert(output->transform), wlr_fbox_transform(&dst_box, &dst_box, wlr_output_transform_invert(output->transform),
buffer->width, buffer->height); buffer->width, buffer->height);
struct wlr_buffer_pass_options options = { struct wlr_buffer_pass_options options = {

13
types/scene/wlr_scene.c
View file

@ -1452,12 +1452,19 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
int x = entry->x - data->logical.x; int x = entry->x - data->logical.x;
int y = entry->y - data->logical.y; int y = entry->y - data->logical.y;
struct wlr_box dst_box = { struct wlr_box box = {
.x = x, .x = x,
.y = y, .y = y,
}; };
scene_node_get_size(node, &dst_box.width, &dst_box.height); scene_node_get_size(node, &box.width, &box.height);
transform_output_box(&dst_box, data); transform_output_box(&box, data);
struct wlr_fbox dst_box = (struct wlr_fbox){
.x = box.x,
.y = box.y,
.width = box.width,
.height = box.height,
};
pixman_region32_t opaque; pixman_region32_t opaque;
pixman_region32_init(&opaque); pixman_region32_init(&opaque);

2
types/wlr_screencopy_v1.c
View file

@ -256,7 +256,7 @@ static bool frame_dma_copy(struct wlr_screencopy_frame_v1 *frame,
wlr_render_pass_add_texture(pass, &(struct wlr_render_texture_options) { wlr_render_pass_add_texture(pass, &(struct wlr_render_texture_options) {
.texture = src_tex, .texture = src_tex,
.blend_mode = WLR_RENDER_BLEND_MODE_NONE, .blend_mode = WLR_RENDER_BLEND_MODE_NONE,
.dst_box = (struct wlr_box){ .dst_box = (struct wlr_fbox){
.width = dst_buffer->width, .width = dst_buffer->width,
.height = dst_buffer->height, .height = dst_buffer->height,
}, },

10
util/matrix.c
View file

@ -120,12 +120,12 @@ void matrix_projection(float mat[static 9], int width, int height,
mat[8] = 1.0f; mat[8] = 1.0f;
} }
void wlr_matrix_project_box(float mat[static 9], const struct wlr_box *box, void wlr_matrix_project_box(float mat[static 9], const struct wlr_fbox *box,
enum wl_output_transform transform, const float projection[static 9]) { enum wl_output_transform transform, const float projection[static 9]) {
int x = box->x; float x = box->x;
int y = box->y; float y = box->y;
int width = box->width; float width = box->width;
int height = box->height; float height = box->height;
wlr_matrix_identity(mat); wlr_matrix_identity(mat);
wlr_matrix_translate(mat, x, y); wlr_matrix_translate(mat, x, y);