fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-07 07:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

surface: correctly apply scale/tranform changes when committed without buffer

Browse source 
{width,height}_from_buffer include the transformations from set_buffer_transform
and set_buffer_scale.
Currently {width,height}_from_buffer are only updated when a commit contains a
new buffer but not for commits with only transformation changes.

If a transform/scale change is commited without new buffer, the old values
remain, which results in incorrect rendering or the client is disconnected
because weston_surface_is_pending_viewport_source_valid() fails.

Make sure to update {width,height}_from_buffer for transformation changes only
to avoid this.

Add a test to verify that the transformations are handled correctly. It is
identical to previous test, except that is spits the buffer attachment and
transformation changes into two commits. So it can reuse the existing images for
validation.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
This commit is contained in:
Michael Olbrich 2026-01-21 10:47:41 +01:00 • committed by Marius Vlad
parent 61e1b9c14a
commit 063a9a0240
2 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libweston/surface-state.c
View file

@ -394,6 +394,14 @@ weston_surface_apply_state(struct weston_surface *surface,
&state->buffer_release_ref);
status |= weston_surface_attach(surface, state, status);
} else if (status & WESTON_SURFACE_DIRTY_SIZE && surface->buffer_ref.buffer) {
bool size_ok;
size_ok = convert_buffer_size_by_transform_scale(&surface->width_from_buffer,
&surface->height_from_buffer,
surface->buffer_ref.buffer,
&state->buffer_viewport);
weston_assert_true(surface->compositor, size_ok);
}
weston_buffer_reference(&state->buffer_ref, NULL,
BUFFER_WILL_NOT_BE_ACCESSED);

51
tests/buffer-transforms-test.c
View file

@ -160,3 +160,54 @@ TEST_P(buffer_transform, my_buffer_args)
return RESULT_OK;
}
TEST_P(buffer_transform_split, my_buffer_args)
{
const struct buffer_args *bargs = data;
const struct setup_args *oargs;
struct client *client;
bool match;
char *refname;
int ret;
oargs = &my_setup_args[get_test_fixture_index()];
ret = asprintf(&refname, "output_%d-%s_buffer_%d-%s",
oargs->scale, oargs->transform_name,
bargs->scale, bargs->transform_name);
test_assert_int_gt(ret, 0);
testlog("%s: %s\n", get_test_name(), refname);
/*
* NOTE! The transform set below is a lie.
* Take that into account when analyzing screenshots.
*/
client = create_client();
client->surface = create_test_surface(client);
client->surface->width = 10000; /* used only for damage */
client->surface->height = 10000;
client->surface->buffer = client_buffer_from_image_file(client,
"basic-test-card",
bargs->scale);
move_client(client, 19, 19);
/*
* Commit scale and transform separately. Otherwise identical to the
* 'buffer_transform' test so the same validation images can be used.
*/
wl_surface_set_buffer_scale(client->surface->wl_surface, bargs->scale);
wl_surface_set_buffer_transform(client->surface->wl_surface,
bargs->transform);
wl_surface_commit(client->surface->wl_surface);
match = verify_screen_content(client, refname, 0, NULL, 0, NULL,
NO_DECORATIONS);
test_assert_true(match);
client_destroy(client);
free(refname);
return RESULT_OK;
}