2 files changed, 93 insertions, 0 deletions
diff --git a/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch b/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch
new file mode 100644
index 0000000000..04fd623e8f
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch
@@ -0,0 +1,92 @@
+From acdceb0b28d86199b8c2233880fa8a04cb24d4d4 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Wed, 24 Jul 2019 09:48:04 +0800
+Subject: [PATCH] Revert "compositor: Revert to GLX as default vblank method
+ (again)"
+This reverts commit e07574d6e7a2dbaa08c3ba4765c6306073d9493e.
+It sets the default vblank method (auto) to GLX from 4.13.2. But it
+fails to start xfwm4 on intel-x86-64 boards with error:
+| xfwm4: ../mesa-19.1.1/src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1293:
+| intel_miptree_match_image: Assertion `image->TexObject->Target == mt->target' failed.
+| Aborted
+There is also a RHEL defect:
+https://bugzilla.redhat.com/show_bug.cgi?id=1678334
+Revert the commit to fix the issue.
+Upstream-Status: Inappropriate [workaround]
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ src/compositor.c | 41 +++++++++++++++++++----------------------
+ 1 file changed, 19 insertions(+), 22 deletions(-)
+diff --git a/src/compositor.c b/src/compositor.c
+index 25615282..daced607 100644
+--- a/src/compositor.c
+++ b/src/compositor.c
+@@ -4483,13 +4483,28 @@ compositorManageScreen (ScreenInfo *screen_info)
+     XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
+     TRACE ("manual compositing enabled");
+ 
+#ifdef HAVE_PRESENT_EXTENSION
+    screen_info->use_present = display_info->have_present &&
+                               (screen_info->vblank_mode == VBLANK_AUTO ||
+                                screen_info->vblank_mode == VBLANK_XPRESENT);
+    if (screen_info->use_present)
+    {
+        screen_info->present_pending = FALSE;
+        XPresentSelectInput (display_info->dpy,
+                             screen_info->output,
+                             PresentCompleteNotifyMask);
+    }
+#else /* HAVE_PRESENT_EXTENSION */
+    screen_info->use_present = FALSE;
+#endif /* HAVE_PRESENT_EXTENSION */
+
+ #ifdef HAVE_EPOXY
+-    screen_info->use_glx = (screen_info->vblank_mode == VBLANK_AUTO ||
+-                            screen_info->vblank_mode == VBLANK_GLX);
+    screen_info->use_glx = !screen_info->use_present &&
+ #ifdef HAVE_XSYNC
+-    screen_info->use_glx &= display_info->have_xsync;
+                            display_info->have_xsync &&
+ #endif /* HAVE_XSYNC */
+-
+                            (screen_info->vblank_mode == VBLANK_AUTO ||
+                             screen_info->vblank_mode == VBLANK_GLX);
+     if (screen_info->use_glx)
+     {
+         screen_info->glx_context = None;
+@@ -4503,24 +4518,6 @@ compositorManageScreen (ScreenInfo *screen_info)
+     screen_info->use_glx = FALSE;
+ #endif /* HAVE_EPOXY */
+ 
+-#ifdef HAVE_PRESENT_EXTENSION
+-    screen_info->use_present = display_info->have_present &&
+-#ifdef HAVE_EPOXY
+-                               !screen_info->use_glx &&
+-#endif /* HAVE_EPOXY */
+-                               (screen_info->vblank_mode == VBLANK_AUTO ||
+-                                screen_info->vblank_mode == VBLANK_XPRESENT);
+-    if (screen_info->use_present)
+-    {
+-        screen_info->present_pending = FALSE;
+-        XPresentSelectInput (display_info->dpy,
+-                             screen_info->output,
+-                             PresentCompleteNotifyMask);
+-    }
+-#else /* HAVE_PRESENT_EXTENSION */
+-    screen_info->use_present = FALSE;
+-#endif /* HAVE_PRESENT_EXTENSION */
+-
+     if (screen_info->use_present)
+     {
+         g_info ("Compositor using XPresent for vsync");
+-- 
+2.20.1
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb
index f4ebb45e05..591580b84f 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb
@@ -8,6 +8,7 @@ inherit xfce update-alternatives distro_features_check
 REQUIRED_DISTRO_FEATURES = "x11"
+SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch"
 SRC_URI[md5sum] = "e53081e5928d401604d158429716e699"
 SRC_URI[sha256sum] = "12ad274f6662c8afee35fd9b9310e73bd462c423578d448b2d7353e3c8eda6c1"

diff --git a/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch b/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch new file mode 100644 index 0000000000..04fd623e8f --- /dev/null +++ b/meta-xfce/recipes-xfce/xfwm4/files/0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch
@@ -0,0 +1,92 @@
		1	From acdceb0b28d86199b8c2233880fa8a04cb24d4d4 Mon Sep 17 00:00:00 2001
		2	From: Kai Kang <kai.kang@windriver.com>
		3	Date: Wed, 24 Jul 2019 09:48:04 +0800
		4	Subject: [PATCH] Revert "compositor: Revert to GLX as default vblank method
		5	(again)"
		6
		7	This reverts commit e07574d6e7a2dbaa08c3ba4765c6306073d9493e.
		8
		9	It sets the default vblank method (auto) to GLX from 4.13.2. But it
		10	fails to start xfwm4 on intel-x86-64 boards with error:
		11
		12	\| xfwm4: ../mesa-19.1.1/src/mesa/drivers/dri/i965/intel_mipmap_tree.c:1293:
		13	\| intel_miptree_match_image: Assertion `image->TexObject->Target == mt->target' failed.
		14	\| Aborted
		15
		16	There is also a RHEL defect:
		17	https://bugzilla.redhat.com/show_bug.cgi?id=1678334
		18
		19	Revert the commit to fix the issue.
		20
		21	Upstream-Status: Inappropriate [workaround]
		22
		23	Signed-off-by: Kai Kang <kai.kang@windriver.com>
		24	---
		25	src/compositor.c \| 41 +++++++++++++++++++----------------------
		26	1 file changed, 19 insertions(+), 22 deletions(-)
		27
		28	diff --git a/src/compositor.c b/src/compositor.c
		29	index 25615282..daced607 100644
		30	--- a/src/compositor.c
		31	+++ b/src/compositor.c
		32	@@ -4483,13 +4483,28 @@ compositorManageScreen (ScreenInfo *screen_info)
		33	XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE);
		34	TRACE ("manual compositing enabled");
		35
		36	+#ifdef HAVE_PRESENT_EXTENSION
		37	+ screen_info->use_present = display_info->have_present &&
		38	+ (screen_info->vblank_mode == VBLANK_AUTO \|\|
		39	+ screen_info->vblank_mode == VBLANK_XPRESENT);
		40	+ if (screen_info->use_present)
		41	+ {
		42	+ screen_info->present_pending = FALSE;
		43	+ XPresentSelectInput (display_info->dpy,
		44	+ screen_info->output,
		45	+ PresentCompleteNotifyMask);
		46	+ }
		47	+#else /* HAVE_PRESENT_EXTENSION */
		48	+ screen_info->use_present = FALSE;
		49	+#endif /* HAVE_PRESENT_EXTENSION */
		50	+
		51	#ifdef HAVE_EPOXY
		52	- screen_info->use_glx = (screen_info->vblank_mode == VBLANK_AUTO \|\|
		53	- screen_info->vblank_mode == VBLANK_GLX);
		54	+ screen_info->use_glx = !screen_info->use_present &&
		55	#ifdef HAVE_XSYNC
		56	- screen_info->use_glx &= display_info->have_xsync;
		57	+ display_info->have_xsync &&
		58	#endif /* HAVE_XSYNC */
		59	-
		60	+ (screen_info->vblank_mode == VBLANK_AUTO \|\|
		61	+ screen_info->vblank_mode == VBLANK_GLX);
		62	if (screen_info->use_glx)
		63	{
		64	screen_info->glx_context = None;
		65	@@ -4503,24 +4518,6 @@ compositorManageScreen (ScreenInfo *screen_info)
		66	screen_info->use_glx = FALSE;
		67	#endif /* HAVE_EPOXY */
		68
		69	-#ifdef HAVE_PRESENT_EXTENSION
		70	- screen_info->use_present = display_info->have_present &&
		71	-#ifdef HAVE_EPOXY
		72	- !screen_info->use_glx &&
		73	-#endif /* HAVE_EPOXY */
		74	- (screen_info->vblank_mode == VBLANK_AUTO \|\|
		75	- screen_info->vblank_mode == VBLANK_XPRESENT);
		76	- if (screen_info->use_present)
		77	- {
		78	- screen_info->present_pending = FALSE;
		79	- XPresentSelectInput (display_info->dpy,
		80	- screen_info->output,
		81	- PresentCompleteNotifyMask);
		82	- }
		83	-#else /* HAVE_PRESENT_EXTENSION */
		84	- screen_info->use_present = FALSE;
		85	-#endif /* HAVE_PRESENT_EXTENSION */
		86	-
		87	if (screen_info->use_present)
		88	{
		89	g_info ("Compositor using XPresent for vsync");
		90	--
		91	2.20.1
		92


diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb index f4ebb45e05..591580b84f 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.13.3.bb
@@ -8,6 +8,7 @@ inherit xfce update-alternatives distro_features_check
8		8
9	REQUIRED_DISTRO_FEATURES = "x11"	9	REQUIRED_DISTRO_FEATURES = "x11"
10		10
		11	SRC_URI += "file://0001-Revert-compositor-Revert-to-GLX-as-default-vblank-me.patch"
11	SRC_URI[md5sum] = "e53081e5928d401604d158429716e699"	12	SRC_URI[md5sum] = "e53081e5928d401604d158429716e699"
12	SRC_URI[sha256sum] = "12ad274f6662c8afee35fd9b9310e73bd462c423578d448b2d7353e3c8eda6c1"	13	SRC_URI[sha256sum] = "12ad274f6662c8afee35fd9b9310e73bd462c423578d448b2d7353e3c8eda6c1"
13		14