Skip to content

Commit

Permalink
xserver-xorg: Refresh the patch to match 21.1.9 version
Browse files Browse the repository at this point in the history
Signed-off-by: Khem Raj <[email protected]>
  • Loading branch information
kraj committed Dec 29, 2023
1 parent 5d963d1 commit 16462d0
Showing 1 changed file with 6 additions and 10 deletions.
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);

0 comments on commit 16462d0

Please sign in to comment.