|
 |
4c4b8b |
From 8c74023712a9e0d79ec669738b726e7dc821de68 Mon Sep 17 00:00:00 2001
|
|
|
4c4b8b |
From: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
4c4b8b |
Date: Wed, 23 Jun 2021 11:35:17 +0200
|
|
|
4c4b8b |
Subject: [PATCH xserver 1/2] xwayland/eglstream: Keep pending stream if the
|
|
|
4c4b8b |
pixmap didn't change
|
|
|
4c4b8b |
MIME-Version: 1.0
|
|
|
4c4b8b |
Content-Type: text/plain; charset=UTF-8
|
|
|
4c4b8b |
Content-Transfer-Encoding: 8bit
|
|
|
4c4b8b |
|
|
|
4c4b8b |
If the pixmap does not actually change in set_window_pixmap(), there is
|
|
|
4c4b8b |
no need to invalidate the pending stream, if there's one.
|
|
|
4c4b8b |
|
|
|
4c4b8b |
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
|
|
|
4c4b8b |
Suggested-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
|
4c4b8b |
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
|
|
4c4b8b |
(cherry picked from commit 2be9f795bc15012dc912f595003e01bb6aa66f54)
|
|
|
4c4b8b |
---
|
|
|
4c4b8b |
hw/xwayland/xwayland-glamor-eglstream.c | 2 +-
|
|
|
4c4b8b |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4c4b8b |
|
|
|
4c4b8b |
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
|
|
|
4c4b8b |
index 0affc954c..2eae9494c 100644
|
|
|
4c4b8b |
--- a/hw/xwayland/xwayland-glamor-eglstream.c
|
|
|
4c4b8b |
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
|
|
|
4c4b8b |
@@ -377,7 +377,7 @@ xwl_eglstream_set_window_pixmap(WindowPtr window, PixmapPtr pixmap)
|
|
|
4c4b8b |
* attached, so the stream would be useless.
|
|
|
4c4b8b |
*/
|
|
|
4c4b8b |
old_pixmap = (*screen->GetWindowPixmap) (window);
|
|
|
4c4b8b |
- if (old_pixmap)
|
|
|
4c4b8b |
+ if (old_pixmap && old_pixmap != pixmap)
|
|
|
4c4b8b |
xwl_eglstream_maybe_set_pending_stream_invalid(old_pixmap);
|
|
|
4c4b8b |
|
|
|
4c4b8b |
xwl_screen->screen->SetWindowPixmap = xwl_eglstream->SetWindowPixmap;
|
|
|
4c4b8b |
--
|
|
|
4c4b8b |
2.31.1
|
|
|
4c4b8b |
|