44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
|
From 64deb9471c7d9cad4c2ec1de1fba6a35c9af8e68 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Erik Kurzinger <ekurzinger@nvidia.com>
|
||
|
|
Date: Fri, 14 May 2021 08:26:49 -0400
|
||
|
|
Subject: [PATCH xserver 21/27] xwayland/eglstream: allow commits to dma-buf
|
||
|
|
backed pixmaps
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
As of commit 098e0f52 xwl_glamor_eglstream_allow_commits will not allow commits
|
||
|
|
if the xwl_pixmap does not have an EGLSurface. This is valid for pixmaps backed
|
||
|
|
by an EGLStream, however pixmaps backed by a dma-buf for OpenGL or Vulkan
|
||
|
|
rendering will never have an EGLSurface. Unlike EGLStream backed pixmaps,
|
||
|
|
though, glamor will render directly to the buffer that Xwayland passes to the
|
||
|
|
compositor. Hence, they don't require the intermediate copy in
|
||
|
|
xwl_glamor_eglstream_post_damage that EGLStream backed pixmaps do, so there is
|
||
|
|
no need for an EGLSurface.
|
||
|
|
|
||
|
|
Signed-off-by: Erik Kurzinger <ekurzinger@nvidia.com>
|
||
|
|
Acked-by: Olivier Fourdan <ofourdan@redhat.com>
|
||
|
|
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
||
|
|
(cherry picked from commit 3d33d885fcd1215a74c1819278cf6f9557c9860b)
|
||
|
|
---
|
||
|
|
hw/xwayland/xwayland-glamor-eglstream.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
|
||
|
|
index 2094d293a..2d0827709 100644
|
||
|
|
--- a/hw/xwayland/xwayland-glamor-eglstream.c
|
||
|
|
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
|
||
|
|
@@ -681,7 +681,8 @@ xwl_glamor_eglstream_allow_commits(struct xwl_window *xwl_window)
|
||
|
|
|
||
|
|
return FALSE;
|
||
|
|
} else {
|
||
|
|
- if (xwl_pixmap->surface != EGL_NO_SURFACE)
|
||
|
|
+ if (xwl_pixmap->surface != EGL_NO_SURFACE ||
|
||
|
|
+ xwl_pixmap->type == XWL_PIXMAP_DMA_BUF)
|
||
|
|
return TRUE;
|
||
|
|
|
||
|
|
/* The pending stream got removed, we have a xwl_pixmap and
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|