This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

wlr_allocator_autocreate #2884

Merged

emersion merged 7 commits into swaywm:master from bl4ckb0ne:wlr_allocator_autocreate

Apr 28, 2021

Contributor

bl4ckb0ne commented Apr 22, 2021

Implements #2861

bl4ckb0ne mentioned this pull request

render/gbm_allocator: make wlr_gbm_allocator_create return a wlr_allocator #2859

Closed

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch from 441046f to fdfa62b Compare

April 23, 2021 21:42

emersion reviewed

View reviewed changes

include/render/wlr_renderer.h Outdated Show resolved Hide resolved

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch 3 times, most recently from 8b71061 to 735a9dd Compare

April 26, 2021 16:17

bl4ckb0ne marked this pull request as ready for review

April 26, 2021 16:18

emersion reviewed

View reviewed changes

backend/drm/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/headless/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/wayland/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/wayland/backend.c Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/x11/backend.c Outdated Show resolved Hide resolved

Member

emersion commented Apr 26, 2021

Can we import the doc-comments from the original issue #2861?

emersion reviewed

View reviewed changes

include/wlr/render/interface.h Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/allocator.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/gbm_allocator.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/allocator.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/allocator.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/allocator.c Outdated Show resolved Hide resolved

emersion mentioned this pull request

drm dumb allocator #2700

Merged

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch from 735a9dd to c97a484 Compare

April 28, 2021 14:13

emersion reviewed

View reviewed changes

backend/wayland/backend.c Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/wayland/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/x11/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

backend/x11/backend.c Outdated

-              			close(drm_fd);
-              			goto error_event;
-              		}
-              		x11->allocator = &gbm_alloc->base;
               		pixmap_formats = &x11->dri3_formats;
               	} else if (x11->have_shm) {

Member

emersion Apr 28, 2021

We can now support both DRI3 and SHM at the same time, so this can be an if instead of an else if.

Contributor Author

bl4ckb0ne Apr 28, 2021

So we should store both pixman formats then right?

Member

emersion Apr 28, 2021

Oh. Hm that won't work too well. We must use the dri3_formats if the allocator is GBM, shm_formats if the allocator is shm. However we don't know whether we'll use GBM or shm prior to wlr_allocator_autocreate. Potential solutions:

Support either DMA-BUFs or shm, not both at the same time. But this will break if DMA-BUFs are available (disabling shm) and the user forces the Pixman renderer (via WLR_RENDERER=pixman).
Check the type of the allocator returned by wlr_allocator_autocreate, with new functions like allocator_is_gbm and allocator_is_shm.
Do something more involved like allocator_get_buffer_caps then check the result to decide which formats to select, but let's keep this for later (if ever), it's over-complicated when there are no third-party allocators.

emersion reviewed

View reviewed changes

backend/x11/backend.c Outdated Show resolved Hide resolved

emersion reviewed

View reviewed changes

render/gbm_allocator.c Outdated Show resolved Hide resolved

Member

emersion commented Apr 28, 2021

Also needs a rebase :)

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch from c97a484 to fcc90a7 Compare

April 28, 2021 18:31


          render/gbm_allocator: make wlr_gbm_allocator_create return a wlr_allo…

70587f3

…cator

bl4ckb0ne added 5 commits

April 28, 2021 14:31


          render/shm_allocator: make wlr_shm_allocator_create return a wlr_allo…

e165566

…cator


          types/wlr_buffer: introduce wlr_buffer_cap

8b92bfd


          backend: introduce backend_get_buffer_caps

d73afa7


          render: introduce renderer_get_render_buffer_caps

8067e94


          render/allocator: introduce wlr_allocator_autocreate

548124c

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch from fcc90a7 to 58bf057 Compare

April 28, 2021 18:43

emersion reviewed

View reviewed changes

backend/x11/backend.c Show resolved Hide resolved


          backend: use wlr_allocator_autocreate

cec1529

bl4ckb0ne force-pushed the wlr_allocator_autocreate branch from 58bf057 to cec1529 Compare

April 28, 2021 18:51

emersion approved these changes

View reviewed changes

Member

emersion left a comment

LGTM, thanks!

emersion merged commit cc1b663 into swaywm:master

emersion mentioned this pull request

Improve backend, renderer and allocator initialization #2861

Closed

emersion added the breaking label

This was referenced Apr 28, 2021

wlroots 0.14.0 #2844

Closed

backend: add common renderer and allocator creation #2901

Merged

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.