diff --git a/CHANGELOG.md b/CHANGELOG.md index 93431c3..bbbcf51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ is missing or empty. ### Desktop +- On the GPU desktop, the shell no longer stays invisible on a device whose + screen is driven by simpledrm. Labwc used to try to show it straight from + the GPU's buffer, which simpledrm cannot take, and now composites it there. + A display driver that takes the GPU's buffers keeps showing them directly. - Every iPad, iPhone and iPod touch screen now starts at the size it has under iOS. Before, only the iPad 6, iPad 7 and iPhone 7 did; on the others, such as the iPod touch 6, everything was drawn at half size. diff --git a/desktop/configuration/login-session b/desktop/configuration/login-session index 8661ddb..13ab699 100644 --- a/desktop/configuration/login-session +++ b/desktop/configuration/login-session @@ -50,7 +50,17 @@ if [[ -n $gpu ]]; then done gpu_desktop=(WLR_RENDERER=gles2 "WLR_RENDER_DRM_DEVICE=/dev/dri/${gpu##*/}" MESA_LOADER_DRIVER_OVERRIDE=zink PVR_I_WANT_A_BROKEN_VULKAN_DRIVER=1) - if [[ -n $display ]]; then gpu_desktop+=("WLR_DRM_DEVICES=$display"); fi + if [[ -n $display ]]; then + gpu_desktop+=("WLR_DRM_DEVICES=$display") + # simpledrm cannot scan out a buffer the GPU drew (it takes no dma-buf), so + # wlroots' direct scan-out of a fullscreen client fails, and that client + # was then never shown: always composite there. A display driver that + # imports the GPU's buffers keeps direct scan-out. + display_driver=$(basename "$(readlink -f "/sys/class/drm/${display##*/}/device/driver")") + if [[ $display_driver == simple-framebuffer || $display_driver == simpledrm ]]; then + gpu_desktop+=(WLR_SCENE_DISABLE_DIRECT_SCANOUT=1) + fi + fi if [[ ! -e /usr/share/vulkan/icd.d/powervr_mesa_icd.json ]]; then gpu_verdict='software desktop: this image has no Vulkan driver for the GPU' elif [[ -z $display || ! -x $gpu_probe ]]; then