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

linux-dmabuf-v1: add helper for output layer feedback events

Browse Source
This commit is contained in:
Simon Ser 2023-02-07 10:57:17 +01:00
parent 22d9df2af4
commit 849c362ffb
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_linux_dmabuf_v1.h
View File

@ -116,6 +116,8 @@ struct wlr_linux_dmabuf_feedback_v1_init_options {
struct wlr_renderer *main_renderer; struct wlr_renderer *main_renderer;
// Output on which direct scan-out is possible on the primary plane, or NULL // Output on which direct scan-out is possible on the primary plane, or NULL
struct wlr_output *scanout_primary_output; struct wlr_output *scanout_primary_output;
// Output layer feedback event, or NULL
const struct wlr_output_layer_feedback_event *output_layer_feedback_event;
}; };
/** /**

20
types/wlr_linux_dmabuf_v1.c
View File

@ -10,6 +10,7 @@
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/types/wlr_linux_dmabuf_v1.h>
#include <wlr/types/wlr_output_layer.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h> #include <xf86drm.h>
#include "linux-dmabuf-unstable-v1-protocol.h" #include "linux-dmabuf-unstable-v1-protocol.h"
@ -1062,6 +1063,8 @@ static bool devid_from_fd(int fd, dev_t *devid) {
bool wlr_linux_dmabuf_feedback_v1_init_with_options(struct wlr_linux_dmabuf_feedback_v1 *feedback, bool wlr_linux_dmabuf_feedback_v1_init_with_options(struct wlr_linux_dmabuf_feedback_v1 *feedback,
const struct wlr_linux_dmabuf_feedback_v1_init_options *options) { const struct wlr_linux_dmabuf_feedback_v1_init_options *options) {
assert(options->main_renderer != NULL); assert(options->main_renderer != NULL);
assert(options->scanout_primary_output == NULL ||
options->output_layer_feedback_event == NULL);
memset(feedback, 0, sizeof(*feedback)); memset(feedback, 0, sizeof(*feedback));
@ -1084,7 +1087,22 @@ bool wlr_linux_dmabuf_feedback_v1_init_with_options(struct wlr_linux_dmabuf_feed
goto error; goto error;
} }
if (options->scanout_primary_output != NULL) { if (options->output_layer_feedback_event != NULL) {
const struct wlr_output_layer_feedback_event *event = options->output_layer_feedback_event;
struct wlr_linux_dmabuf_feedback_v1_tranche *tranche =
wlr_linux_dmabuf_feedback_add_tranche(feedback);
if (tranche == NULL) {
goto error;
}
tranche->target_device = event->target_device;
tranche->flags = ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT;
if (!wlr_drm_format_set_intersect(&tranche->formats, event->formats, renderer_formats)) {
wlr_log(WLR_ERROR, "Failed to intersect renderer and scanout formats");
goto error;
}
} else if (options->scanout_primary_output != NULL) {
int backend_drm_fd = wlr_backend_get_drm_fd(options->scanout_primary_output->backend); int backend_drm_fd = wlr_backend_get_drm_fd(options->scanout_primary_output->backend);
if (backend_drm_fd < 0) { if (backend_drm_fd < 0) {
wlr_log(WLR_ERROR, "Failed to get backend DRM FD"); wlr_log(WLR_ERROR, "Failed to get backend DRM FD");