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