nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-04-27 21:09:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'image-copy-capture' into 'master'

Browse Source 
ext-image-capture-source-v1: Send all render formats

See merge request wlroots/wlroots!5019
This commit is contained in:
Kenny Levinsen 2025-04-16 16:45:00 +00:00
commit c93ab4516d
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
types/ext_image_capture_source_v1/base.c
View File

@ -9,6 +9,8 @@
#include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_ext_image_capture_source_v1.h>
#include <wlr/util/log.h>
#include "render/drm_format_set.h"
#include "render/wlr_renderer.h"
#include "ext-image-capture-source-v1-protocol.h"
static void source_handle_destroy(struct wl_client *client,
@ -101,24 +103,32 @@ bool wlr_ext_image_capture_source_v1_set_constraints_from_swapchain(struct wlr_e
source->width = swapchain->width;
source->height = swapchain->height;
// If we are dealing with a CPU renderer, we will only be able to target
// shm buffers, and any format conversion will be very expensive. To avoid
// taking on that cost, we only advertise the swapchain's current format.
// TODO: Consider allowing more formats if swapchain is not CPU buffer.
uint32_t shm_format = get_swapchain_shm_format(swapchain, renderer);
if (shm_format != DRM_FORMAT_INVALID) {
uint32_t *shm_formats = calloc(1, sizeof(shm_formats[0]));
if (shm_formats == NULL) {
wlr_log(WLR_ERROR, "Allocation failed");
if (shm_format == DRM_FORMAT_INVALID) {
wlr_log(WLR_ERROR, "Unable to get swapchain format");
return false;
}
uint32_t *shm_formats = calloc(1, sizeof(*shm_formats));
if (shm_formats == NULL) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
return false;
}
shm_formats[0] = shm_format;
source->shm_formats_len = 1;
free(source->shm_formats);
source->shm_formats = shm_formats;
source->shm_formats[0] = shm_format;
source->shm_formats_len = 1;
} else {
free(source->shm_formats);
source->shm_formats_len = 0;
source->shm_formats = NULL;
}
int drm_fd = wlr_renderer_get_drm_fd(renderer);
if (swapchain->allocator != NULL &&
(swapchain->allocator->buffer_caps & WLR_BUFFER_CAP_DMABUF) &&
drm_fd >= 0) {
if (renderer->render_buffer_caps & WLR_BUFFER_CAP_DMABUF && drm_fd >= 0) {
struct stat dev_stat;
if (fstat(drm_fd, &dev_stat) != 0) {
wlr_log_errno(WLR_ERROR, "fstat() failed");
@ -127,13 +137,16 @@ bool wlr_ext_image_capture_source_v1_set_constraints_from_swapchain(struct wlr_e
source->dmabuf_device = dev_stat.st_rdev;
const struct wlr_drm_format_set *render_formats =
wlr_renderer_get_render_formats(renderer);
assert(render_formats);
wlr_drm_format_set_finish(&source->dmabuf_formats);
source->dmabuf_formats = (struct wlr_drm_format_set){0};
wlr_drm_format_set_copy(&source->dmabuf_formats, render_formats);
} else {
wlr_drm_format_set_finish(&source->dmabuf_formats);
source->dmabuf_formats = (struct wlr_drm_format_set){0};
for (size_t i = 0; i < swapchain->format.len; i++) {
wlr_drm_format_set_add(&source->dmabuf_formats,
swapchain->format.format, swapchain->format.modifiers[i]);
}
}
wl_signal_emit_mutable(&source->events.constraints_update, NULL);