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.

1 files changed, 6 insertions, 2 deletions

diff --git a/video/out/wldmabuf/ra_wldmabuf.c b/video/out/wldmabuf/ra_wldmabuf.c
index eda2cc9fe8..a3499a25e9 100644
--- a/video/out/wldmabuf/ra_wldmabuf.c
+++ b/video/out/wldmabuf/ra_wldmabuf.c
@@ -34,12 +34,16 @@ bool ra_compatible_format(struct ra* ra, uint32_t drm_format, uint64_t modifier)
     struct vo_wayland_state *wl = p->vo->wl;
     const wayland_format *formats = wl->format_map;
 
-    for (int i = 0; i < wl->format_size / sizeof(wayland_format); i++)
-    {
+    for (int i = 0; i < wl->format_size / sizeof(wayland_format); i++) {
         if (drm_format == formats[i].format && modifier == formats[i].modifier)
             return true;
     }
 
+    for (int i = 0; i < wl->drm_format_ct; i++) {
+        if (drm_format == wl->drm_formats[i])
+            return true;
+    }
+
     return false;
 }