mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-22 06:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix errors from change in wlr_drm_connector_state

Browse source
This commit is contained in:
Christian Kröner 2021-11-13 10:54:01 +01:00
parent d1984032ab
commit 0c45125ac7
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/drm/atomic.c
View file

@ -142,9 +142,9 @@ static void set_plane_props(struct atomic *atom, struct wlr_box source_box,
} }
uint32_t width = source_box.width ? (uint32_t)source_box.width : uint32_t width = source_box.width ? (uint32_t)source_box.width :
fb->wlr_buf->width; (uint32_t)fb->wlr_buf->width;
uint32_t height = source_box.height ? (uint32_t)source_box.height : uint32_t height = source_box.height ? (uint32_t)source_box.height :
fb->wlr_buf->height; (uint32_t)fb->wlr_buf->height;
// The src_* properties are in 16.16 fixed point // The src_* properties are in 16.16 fixed point
atomic_add(atom, id, props->src_x, (uint64_t)source_box.x << 16); atomic_add(atom, id, props->src_x, (uint64_t)source_box.x << 16);
@ -242,12 +242,12 @@ static bool atomic_crtc_commit(struct wlr_drm_connector *conn,
atomic_add(&atom, crtc->id, crtc->props.active, active); atomic_add(&atom, crtc->id, crtc->props.active, active);
if (active) { if (active) {
struct wlr_box source_box; struct wlr_box source_box;
if (state->committed & WLR_OUTPUT_STATE_SOURCE_BOX) { if (state->base->committed & WLR_OUTPUT_STATE_SOURCE_BOX) {
/** /**
* Grab source box from output in order to crop the * Grab source box from output in order to crop the
* buffer. * buffer.
*/ */
source_box = state->source_box; source_box = state->base->source_box;
} }
else { else {
// Use dummy source box // Use dummy source box