-
Notifications
You must be signed in to change notification settings - Fork 257
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
xserver-xorg: Refresh the patch to match 21.1.9 version
Signed-off-by: Khem Raj <[email protected]>
- Loading branch information
Showing
1 changed file
with
6 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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); |