From 315d018f17478b93a0151611edc7a8ccb0eac73f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 10 Apr 2023 10:01:43 -0700 Subject: xwayland: Drop upstreamed patch to make use of GL_EXT_texture_format_BGRA8888 OE-core is soon upgrading to xwayland 23.x and this patch is already part of this release [1] Be aware that this would be post mickledore release, so this patch is not backportable to mickledore, its only for upcoming master and beyond. [1] https://gitlab.freedesktop.org/xorg/xserver/-/commit/24cd5f34f8edcc6621ed9c0f2b1a3df08de7488d Signed-off-by: Khem Raj --- ...or-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch | 39 ---------------------- recipes-graphics/xwayland/xwayland_%.bbappend | 1 - 2 files changed, 40 deletions(-) delete mode 100644 recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch diff --git a/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch deleted file mode 100644 index 1c6cf2ec..00000000 --- a/recipes-graphics/xwayland/xwayland/0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4508e54dae9d2884b2d6ccca13450b25d509cc9a Mon Sep 17 00:00:00 2001 -From: Xianzhong -Date: Thu, 5 Aug 2021 16:57:43 +0800 -Subject: [PATCH 3/3] glamor: Fix fbo pixmap format with GL_BGRA_EXT - -Red and Blue channels are swizzled in GLES path, -Fix color inverse problem with ximagesink command: -gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v - -This fix requires GL_EXT_texture_format_BGRA8888 extension, not applicable for upstream. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Xianzhong ---- - glamor/glamor.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -Index: xwayland-21.1.4/glamor/glamor.c -=================================================================== ---- xwayland-21.1.4.orig/glamor/glamor.c -+++ xwayland-21.1.4/glamor/glamor.c -@@ -586,10 +586,17 @@ glamor_setup_formats(ScreenPtr screen) - - if (glamor_priv->is_gles) { - assert(X_BYTE_ORDER == X_LITTLE_ENDIAN); -+#if GL_EXT_texture_format_BGRA8888 -+ glamor_add_format(screen, 24, PICT_x8r8g8b8, -+ GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); -+ glamor_add_format(screen, 32, PICT_a8r8g8b8, -+ GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); -+#else - glamor_add_format(screen, 24, PICT_x8b8g8r8, - GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); - glamor_add_format(screen, 32, PICT_a8b8g8r8, - GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); -+#endif - } else { - glamor_add_format(screen, 24, PICT_x8r8g8b8, - GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE); diff --git a/recipes-graphics/xwayland/xwayland_%.bbappend b/recipes-graphics/xwayland/xwayland_%.bbappend index f2141f4f..8515a538 100644 --- a/recipes-graphics/xwayland/xwayland_%.bbappend +++ b/recipes-graphics/xwayland/xwayland_%.bbappend @@ -2,7 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI:append:imxgpu = " \ file://0001-Prefer-to-create-GLES2-context-for-glamor-EGL.patch \ - file://0002-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch \ " OPENGL_PKGCONFIGS:remove:imxgpu = "${OPENGL_PKGCONFIGS_REMOVE_IMXGPU}" -- cgit v1.2.3-54-g00ecf