mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm: Pass paint node to drm_plane_state_coords_for_view 

Rename the function as well, as it no longer takes a view.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2023-01-06 11:55:28 -06:00 committed by Daniel Stone
parent a65ba82232
commit 7c7489fe79
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libweston/backend-drm/drm-internal.h
View File

@ -838,8 +838,9 @@ drm_plane_state_free(struct drm_plane_state *state, bool force);
void
drm_plane_state_put_back(struct drm_plane_state *state);
bool
drm_plane_state_coords_for_view(struct drm_plane_state *state,
struct weston_view *ev, uint64_t zpos);
drm_plane_state_coords_for_paint_node(struct drm_plane_state *state,
struct weston_paint_node *node,
uint64_t zpos);
void
drm_plane_reset_state(struct drm_plane *plane);

6
libweston/backend-drm/state-helpers.c
View File

@ -204,10 +204,12 @@ drm_plane_state_put_back(struct drm_plane_state *state)
* a given plane.
*/
bool
drm_plane_state_coords_for_view(struct drm_plane_state *state,
struct weston_view *ev, uint64_t zpos)
drm_plane_state_coords_for_paint_node(struct drm_plane_state *state,
struct weston_paint_node *node,
uint64_t zpos)
{
struct drm_output *output = state->output;
struct weston_view *ev = node->view;
struct weston_buffer *buffer = ev->surface->buffer_ref.buffer;
pixman_region32_t dest_rect, src_rect;
pixman_box32_t *box;

4
libweston/backend-drm/state-propose.c
View File

@ -102,7 +102,7 @@ drm_output_try_paint_node_on_plane(struct drm_plane *plane,
assert(!state->fb);
state->output = output;
if (!drm_plane_state_coords_for_view(state, ev, zpos)) {
if (!drm_plane_state_coords_for_paint_node(state, node, zpos)) {
drm_debug(b, "\t\t\t\t[view] not placing view %p on plane: "
"unsuitable transform\n", ev);
goto out;
@ -220,7 +220,7 @@ drm_output_prepare_cursor_paint_node(struct drm_output_state *output_state,
/* We can't scale with the legacy API, and we don't try to account for
* simple cropping/translation in cursor_bo_update. */
plane_state->output = output;
if (!drm_plane_state_coords_for_view(plane_state, ev, zpos)) {
if (!drm_plane_state_coords_for_paint_node(plane_state, node, zpos)) {
drm_debug(b, "\t\t\t\t[%s] not placing view %p on %s: "
"unsuitable transform\n", p_name, ev, p_name);
goto err;