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

surface: Pass weston_surface_state into attach

Browse source 
attach needs to consider the viewport as well, so it makes more sense
for attach to consistently access the weston_surface_state, rather than
part from the surface and part from a function argument.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone 2023-06-20 01:34:33 +01:00
parent a994e02a7e
commit 3100d3635f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libweston/compositor.c
View file

@ -2643,11 +2643,12 @@ bind_single_pixel_buffer(struct wl_client *client, void *data, uint32_t version,
static enum weston_surface_status
weston_surface_attach(struct weston_surface *surface,
struct weston_buffer *buffer)
struct weston_surface_state *state)
{
struct weston_buffer_viewport *vp = &surface->buffer_viewport;
struct weston_buffer_viewport *vp = &state->buffer_viewport;
int32_t old_width = surface->width_from_buffer;
int32_t old_height = surface->height_from_buffer;
struct weston_buffer *buffer = state->buffer;
enum weston_surface_status status = WESTON_SURFACE_CLEAN;
if (!buffer) {
@ -4052,7 +4053,7 @@ weston_surface_commit_state(struct weston_surface *surface,
/* wp_presentation.feedback */
weston_presentation_feedback_discard_list(&surface->feedback_list);
status |= weston_surface_attach(surface, state->buffer);
status |= weston_surface_attach(surface, state);
}
weston_surface_state_set_buffer(state, NULL);
assert(state->acquire_fence_fd == -1);