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

Merge branch 'output-layers-unmapped' into 'master'

Browse source 
output-layers: change semantics of wlr_output_state.layers

See merge request wlroots/wlroots!4195
This commit is contained in:
Simon Ser 2026-01-11 05:55:29 +00:00
commit a860e5513e
8 changed files with 121 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/drm/drm.c
View file

@ -802,11 +802,7 @@ static bool drm_connector_set_pending_layer_fbs(struct wlr_drm_connector *conn,
return false;
}
if (layer_state->buffer != NULL) {
drm_fb_import(&layer->pending_fb, drm, layer_state->buffer, NULL);
} else {
drm_fb_clear(&layer->pending_fb);
}
drm_fb_import(&layer->pending_fb, drm, layer_state->buffer, NULL);
}
return true;

33
backend/drm/libliftoff.c
View file

@ -4,6 +4,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <wlr/interfaces/wlr_output.h>
#include <wlr/util/box.h>
#include <wlr/util/log.h>
@ -184,23 +185,17 @@ static bool set_layer_props(struct wlr_drm_backend *drm,
struct wl_array *fb_damage_clips_arr) {
struct wlr_drm_layer *layer = get_drm_layer(drm, state->layer);
uint32_t width = 0, height = 0;
if (state->buffer != NULL) {
width = state->buffer->width;
height = state->buffer->height;
}
uint32_t width = state->buffer->width;
uint32_t height = state->buffer->height;
struct wlr_drm_fb *fb = layer->pending_fb;
int ret = 0;
if (state->buffer == NULL) {
ret = liftoff_layer_set_property(layer->liftoff, "FB_ID", 0);
} else if (fb == NULL) {
if (fb == NULL) {
liftoff_layer_set_fb_composited(layer->liftoff);
} else {
ret = liftoff_layer_set_property(layer->liftoff, "FB_ID", fb->id);
}
if (ret != 0) {
return false;
int ret = liftoff_layer_set_property(layer->liftoff, "FB_ID", fb->id);
if (ret != 0) {
return false;
}
}
uint64_t crtc_x = (uint64_t)state->dst_box.x;
@ -363,6 +358,18 @@ static bool add_connector(drmModeAtomicReq *req,
ok = ok && set_layer_props(drm, layer_state, i + 1,
fb_damage_clips_arr);
}
struct wlr_output_layer *wlr_layer;
wl_list_for_each(wlr_layer, &conn->output.layers, link) {
if (wlr_output_state_is_layer_enabled(state->base, wlr_layer)) {
continue;
}
struct wlr_drm_layer *layer = get_drm_layer(drm, wlr_layer);
if (layer == NULL) {
continue;
}
liftoff_layer_set_property(layer->liftoff, "FB_ID", 0);
}
}
if (crtc->cursor) {