mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-17 06:46:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Perform direct scanout on secondary GPUs

Browse source 
This change attempts to import the buffer directly into the target
DRM context, and only performs drm_surface_blit if that doesn't
work.

Also advertise all scanout mods instead of only the ones compatible with
the main dev, since we can now scan them out.
This commit is contained in:
Austin Shafer 2022-08-02 13:06:31 -04:00
parent 0925a529ab
commit eb812f34f0
4 changed files with 66 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
backend/drm/renderer.c
View file

@ -75,7 +75,7 @@ bool init_drm_surface(struct wlr_drm_surface *surf,
}
struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
struct wlr_buffer *buffer) {
struct wlr_drm_renderer *parent_renderer, struct wlr_buffer *buffer) {
struct wlr_renderer *renderer = surf->renderer->wlr_rend;
if (surf->swapchain->width != buffer->width ||
@ -84,11 +84,23 @@ struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
return NULL;
}
struct wlr_texture *tex = wlr_texture_from_buffer(renderer, buffer);
if (tex == NULL) {
wlr_log(WLR_ERROR, "Failed to import source buffer into multi-GPU renderer");
struct wlr_texture_set *set = wlr_texture_set_create(renderer, NULL);
if (set == NULL) {
wlr_log(WLR_ERROR, "Failed to import source buffer multi-GPU texture set");
return NULL;
}
/* Add the parent renderer so the texture set can use it for copies */
wlr_texture_set_add_renderer(set, parent_renderer->wlr_rend, parent_renderer->allocator);
if (!wlr_texture_set_import_buffer(set, buffer)) {
wlr_log(WLR_ERROR, "Failed to import source buffer multi-GPU texture set");
goto error_tex;
}
struct wlr_texture *tex = wlr_texture_set_get_tex_for_renderer(set, renderer);
if (tex == NULL) {
wlr_log(WLR_ERROR, "Failed to export source buffer for multi-GPU renderer");
goto error_tex;
}
struct wlr_buffer *dst = wlr_swapchain_acquire(surf->swapchain, NULL);
if (!dst) {
@ -111,14 +123,14 @@ struct wlr_buffer *drm_surface_blit(struct wlr_drm_surface *surf,
goto error_dst;
}
wlr_texture_destroy(tex);
wlr_texture_set_destroy(set);
return dst;
error_dst:
wlr_buffer_unlock(dst);
error_tex:
wlr_texture_destroy(tex);
wlr_texture_set_destroy(set);
return NULL;
}