Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xserver-xorg: Refresh the patch to match 21.1.9 version #1716

Merged
merged 1 commit into from
Dec 30, 2023
Merged

xserver-xorg: Refresh the patch to match 21.1.9 version #1716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions ...aphics/xorg-xserver/xserver-xorg/0001-glamor-Fix-fbo-pixmap-format-with-GL_BGRA_EXT.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,23 @@ Signed-off-by: Xianzhong <[email protected]>
glamor/glamor.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 3450113e0..e327b9db8 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -574,10 +574,17 @@ glamor_setup_formats(ScreenPtr screen)
@@ -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);
+ 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);
+ 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);
GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, TRUE);
glamor_add_format(screen, 32, PICT_a8b8g8r8,
GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE);
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);
--
2.17.1
GL_RGBA, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, TRUE);
Loading