mirror of
https://github.com/swaywm/sway.git
synced 2024-11-28 10:51:28 +00:00
Merge branch 'master' into disable_titlebar
This commit is contained in:
commit
ff9c5aa647
|
@ -240,14 +240,13 @@ bool server_init(struct sway_server *server) {
|
||||||
|
|
||||||
wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
|
wlr_renderer_init_wl_shm(server->renderer, server->wl_display);
|
||||||
|
|
||||||
if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL) {
|
if (wlr_renderer_get_texture_formats(server->renderer, WLR_BUFFER_CAP_DMABUF) != NULL) {
|
||||||
server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
|
server->linux_dmabuf_v1 = wlr_linux_dmabuf_v1_create_with_renderer(
|
||||||
server->wl_display, 4, server->renderer);
|
server->wl_display, 4, server->renderer);
|
||||||
}
|
if (debug.legacy_wl_drm) {
|
||||||
if (wlr_renderer_get_dmabuf_texture_formats(server->renderer) != NULL &&
|
|
||||||
debug.legacy_wl_drm) {
|
|
||||||
wlr_drm_create(server->wl_display, server->renderer);
|
wlr_drm_create(server->wl_display, server->renderer);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
server->allocator = wlr_allocator_autocreate(server->backend,
|
server->allocator = wlr_allocator_autocreate(server->backend,
|
||||||
server->renderer);
|
server->renderer);
|
||||||
|
|
Loading…
Reference in a new issue