diff options
| author | Dudemanguy <random342@airmail.cc> | 2023-02-17 11:24:15 -0600 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2023-02-18 02:21:54 +0000 |
| commit | e2cdc23af06f0911ced2d17034ee3ff6f5a98820 (patch) | |
| tree | 709450aa90d7e9454f7641ce5adf365bcba6695b /video/out/wayland_common.h | |
| parent | 7607432127d5aa4e2a6e8cc05ea112c19aa9ff7f (diff) | |
| download | mpv-e2cdc23af06f0911ced2d17034ee3ff6f5a98820.tar.bz2 mpv-e2cdc23af06f0911ced2d17034ee3ff6f5a98820.tar.xz | |
Revert "vo_dmabuf_wayland: drop support for linux-dmabuf-v2"
This was originally dropped because it was thought to be unneeded at the
time, but at least some devices (rockchip) apparently are still on old
compositors that use linux-dmabuf v2. It's not much code, and for
testing purposes it's good to have around since it's hard to test
drmprime otherwise. Some minor additions are here to support the newly
added vaapi-format mapping in v2 of the protocol.
This reverts commit a5b9d529eec8d4bb6fc858143337c3573ec8afd0.
Diffstat (limited to 'video/out/wayland_common.h')
| -rw-r--r-- | video/out/wayland_common.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index 5c36f6f05a..5aa6f6d612 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -104,6 +104,10 @@ struct vo_wayland_state { void *dmabuf_feedback; wayland_format *format_map; uint32_t format_size; + /* TODO: remove these once zwp_linux_dmabuf_v1 version 2 support is removed. */ + int *drm_formats; + int drm_format_ct; + int drm_format_ct_max; /* presentation-time */ struct wp_presentation *presentation; @@ -162,7 +166,6 @@ struct vo_wayland_state { bool vo_wayland_check_visible(struct vo *vo); bool vo_wayland_init(struct vo *vo); bool vo_wayland_reconfig(struct vo *vo); -bool vo_wayland_supported_format(struct vo *vo, uint32_t format, uint64_t modifier); int vo_wayland_allocate_memfd(struct vo *vo, size_t size); int vo_wayland_control(struct vo *vo, int *events, int request, void *arg); |