diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2024-03-12 11:09:55 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-18 15:41:17 +0000 |
| commit | ca73cd8a9d4fba648601f78027b0099548c796de (patch) | |
| tree | 3f31ae81f78f62e8dcb2b6f6a2f6240df1ca83da /hw/xwayland/xwayland-glamor.c | |
| parent | 2ccabf5aa8b110b8de52fcc74a89e4dcbc91f7fe (diff) | |
xwayland/glamor: Drop xwl_glamor_gbm_has_wl_interfaces()
And merge it back into xwl_glamor_has_wl_interfaces()
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
Diffstat (limited to 'hw/xwayland/xwayland-glamor.c')
| -rw-r--r-- | hw/xwayland/xwayland-glamor.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index 42a5ea820..d518bfb90 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -121,7 +121,13 @@ Bool xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen, struct xwl_egl_backend *xwl_egl_backend) { - return xwl_egl_backend->has_wl_interfaces(xwl_screen); + if (!xwl_glamor_has_wl_drm(xwl_screen) && + xwl_screen->dmabuf_protocol_version < 4) { + LogMessageVerb(X_INFO, 3, "glamor: 'wl_drm' not supported and linux-dmabuf v4 not supported\n"); + return FALSE; + } + + return TRUE; } struct wl_buffer * |