nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

render: drop wlr_renderer_get_dmabuf_texture_formats()

Browse Source 
wlr_renderer_get_texture_formats() with WLR_BUFFER_CAP_DMABUF is
the replacement.
This commit is contained in:
Simon Ser 2024-04-18 16:42:10 +02:00 committed by Kenny Levinsen
parent 85c1eda721
commit 0686666cf5
6 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/backend.c
View File

@ -234,7 +234,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wlr_session *session,
// to be able to texture from them // to be able to texture from them
struct wlr_renderer *renderer = drm->mgpu_renderer.wlr_rend; struct wlr_renderer *renderer = drm->mgpu_renderer.wlr_rend;
const struct wlr_drm_format_set *texture_formats = const struct wlr_drm_format_set *texture_formats =
wlr_renderer_get_dmabuf_texture_formats(renderer); wlr_renderer_get_texture_formats(renderer, WLR_BUFFER_CAP_DMABUF);
if (texture_formats == NULL) { if (texture_formats == NULL) {
wlr_log(WLR_ERROR, "Failed to query renderer texture formats"); wlr_log(WLR_ERROR, "Failed to query renderer texture formats");
goto error_mgpu_renderer; goto error_mgpu_renderer;

2
examples/output-layers.c
View File

@ -296,7 +296,7 @@ int main(int argc, char *argv[]) {
server.renderer = wlr_renderer_autocreate(server.backend); server.renderer = wlr_renderer_autocreate(server.backend);
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) {
wlr_drm_create(server.wl_display, server.renderer); wlr_drm_create(server.wl_display, server.renderer);
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);

6
include/wlr/render/wlr_renderer.h
View File

@ -59,12 +59,6 @@ struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend);
*/ */
const struct wlr_drm_format_set *wlr_renderer_get_texture_formats( const struct wlr_drm_format_set *wlr_renderer_get_texture_formats(
struct wlr_renderer *r, uint32_t buffer_caps); struct wlr_renderer *r, uint32_t buffer_caps);
/**
* Get the DMA-BUF formats supporting sampling usage. Buffers allocated with
* a format from this list may be imported via wlr_texture_from_dmabuf().
*/
const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_texture_formats(
struct wlr_renderer *renderer);
/** /**
* Initializes wl_shm, linux-dmabuf and other buffer factory protocols. * Initializes wl_shm, linux-dmabuf and other buffer factory protocols.

7
render/wlr_renderer.c
View File

@ -62,11 +62,6 @@ const struct wlr_drm_format_set *wlr_renderer_get_texture_formats(
return r->impl->get_texture_formats(r, buffer_caps); return r->impl->get_texture_formats(r, buffer_caps);
} }
const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_texture_formats(
struct wlr_renderer *r) {
return wlr_renderer_get_texture_formats(r, WLR_BUFFER_CAP_DMABUF);
}
const struct wlr_drm_format_set *wlr_renderer_get_render_formats( const struct wlr_drm_format_set *wlr_renderer_get_render_formats(
struct wlr_renderer *r) { struct wlr_renderer *r) {
if (!r->impl->get_render_formats) { if (!r->impl->get_render_formats) {
@ -90,7 +85,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
return false; return false;
} }
if (wlr_renderer_get_dmabuf_texture_formats(r) != NULL && if (wlr_renderer_get_texture_formats(r, WLR_BUFFER_CAP_DMABUF) != NULL &&
wlr_renderer_get_drm_fd(r) >= 0 && wlr_renderer_get_drm_fd(r) >= 0 &&
wlr_linux_dmabuf_v1_create_with_renderer(wl_display, 4, r) == NULL) { wlr_linux_dmabuf_v1_create_with_renderer(wl_display, 4, r) == NULL) {
return false; return false;

3
types/wlr_drm.c
View File

@ -236,7 +236,8 @@ struct wlr_drm *wlr_drm_create(struct wl_display *display,
drm->node_name = node_name; drm->node_name = node_name;
wl_signal_init(&drm->events.destroy); wl_signal_init(&drm->events.destroy);
const struct wlr_drm_format_set *formats = wlr_renderer_get_dmabuf_texture_formats(renderer); const struct wlr_drm_format_set *formats =
wlr_renderer_get_texture_formats(renderer, WLR_BUFFER_CAP_DMABUF);
if (formats == NULL) { if (formats == NULL) {
goto error; goto error;
} }

2
types/wlr_linux_dmabuf_v1.c
View File

@ -1100,7 +1100,7 @@ bool wlr_linux_dmabuf_feedback_v1_init_with_options(struct wlr_linux_dmabuf_feed
feedback->main_device = renderer_dev; feedback->main_device = renderer_dev;
const struct wlr_drm_format_set *renderer_formats = const struct wlr_drm_format_set *renderer_formats =
wlr_renderer_get_dmabuf_texture_formats(options->main_renderer); wlr_renderer_get_texture_formats(options->main_renderer, WLR_BUFFER_CAP_DMABUF);
if (renderer_formats == NULL) { if (renderer_formats == NULL) {
wlr_log(WLR_ERROR, "Failed to get renderer DMA-BUF texture formats"); wlr_log(WLR_ERROR, "Failed to get renderer DMA-BUF texture formats");
goto error; goto error;