diff options
| author | QingLee95 <l.qing95@gmail.com> | 2025-12-19 11:57:39 +0100 |
|---|---|---|
| committer | QingLee95 <l.qing95@gmail.com> | 2025-12-19 12:31:13 +0100 |
| commit | 9c74f040672f3cfc801a32b2b2d4347773001b55 (patch) | |
| tree | b3ab046edc346793482b62272b2f97b1c67424dc /recipes-graphics | |
| parent | 2781242e499e601ef9454009aceed16186a48d9e (diff) | |
| download | meta-freescale-9c74f040672f3cfc801a32b2b2d4347773001b55.tar.gz | |
xserver-xorg: remove glamor pixmap patch
Already implemented in xserver-xorg
Signed-off-by: QingLee95 <l.qing95@gmail.com>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch | 38 | ||||
| -rw-r--r-- | recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | 2 |
2 files changed, 0 insertions, 40 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch deleted file mode 100644 index 960bf3b50..000000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | From c76f5d2c0a0dda534888025d7236465202884665 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Xianzhong <xianzhong.li@nxp.com> | ||
| 3 | Date: Thu, 5 Aug 2021 16:57:43 +0800 | ||
| 4 | Subject: [PATCH] glamor: Fix fbo pixmap format with GL_BGRA_EXT | ||
| 5 | |||
| 6 | Red and Blue channels are swizzled in GLES path, | ||
| 7 | Fix color inverse problem with ximagesink command: | ||
| 8 | gst-launch-1.0 videotestsrc pattern=6 num-buffers=1 ! video/x-raw,format=BGRx ! videoconvert ! ximagesink display=:0 -v | ||
| 9 | |||
| 10 | This fix requires GL_EXT_texture_format_BGRA8888 extention, not applicable for upstream. | ||
| 11 | |||
| 12 | Upstream-Status: Inappropriate | ||
| 13 | |||
| 14 | Signed-off-by: Xianzhong <xianzhong.li@nxp.com> | ||
| 15 | --- | ||
| 16 | glamor/glamor.c | 7 +++++++ | ||
| 17 | 1 file changed, 7 insertions(+) | ||
| 18 | |||
| 19 | --- a/glamor/glamor.c | ||
| 20 | +++ b/glamor/glamor.c | ||
| 21 | @@ -586,10 +586,17 @@ glamor_setup_formats(ScreenPtr screen) | ||
| 22 | |||
| 23 | if (glamor_priv->is_gles) { | ||
| 24 | assert(X_BYTE_ORDER == X_LITTLE_ENDIAN); | ||
| 25 | +#if GL_EXT_texture_format_BGRA8888 | ||
| 26 | + glamor_add_format(screen, 24, PICT_x8r8g8b8, | ||
| 27 | + GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); | ||
| 28 | + glamor_add_format(screen, 32, PICT_a8r8g8b8, | ||
| 29 | + GL_BGRA_EXT, GL_BGRA_EXT, GL_UNSIGNED_BYTE, TRUE); | ||
| 30 | +#else | ||
| 31 | glamor_add_format(screen, 24, PICT_x8b8g8r8, | ||
| 32 | GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); | ||
| 33 | glamor_add_format(screen, 32, PICT_a8b8g8r8, | ||
| 34 | GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE); | ||
| 35 | +#endif | ||
| 36 | } else { | ||
| 37 | glamor_add_format(screen, 24, PICT_x8r8g8b8, | ||
| 38 | GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE); | ||
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index cf1c3a50f..161df0498 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend | |||
| @@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" | |||
| 2 | 2 | ||
| 3 | SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch" | 3 | SRC_URI:append:use-mainline-bsp = " file://0001-Allow-to-enable-atomic-in-modesetting-DDX.patch" |
| 4 | 4 | ||
| 5 | SRC_URI:append:imxgpu = " file://0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch" | ||
| 6 | |||
| 7 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" | 5 | IMX_OPENGL_PKGCONFIGS_REMOVE = "" |
| 8 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" | 6 | IMX_OPENGL_PKGCONFIGS_REMOVE:imxgpu = "glamor" |
| 9 | OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" | 7 | OPENGL_PKGCONFIGS:remove:mx6-nxp-bsp = "${IMX_OPENGL_PKGCONFIGS_REMOVE}" |
