From 2cd62ad567a0aeea5213b537cdb862aeb23fc9d2 Mon Sep 17 00:00:00 2001 From: stefan11111 Date: Sun, 25 Jan 2026 01:43:43 +0200 Subject: [PATCH] glamor: Don't forbid GLES contexts If this ever causes problems, we can fix this code then. The "error case" that this code is trying to prevent happens even when using GL contexts. From my testing, all this code does is forbid GLES contexts, which work just fine without this filter. See: https://gitlab.freedesktop.org/xorg/xserver/-/commit/8702c938b33b9ec180d64754eb922515c7c4a98b for the commit that introduced this code. Signed-off-by: stefan11111 --- glamor/glamor.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/glamor/glamor.c b/glamor/glamor.c index 33edb6679..a09ed9458 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -472,6 +472,19 @@ glamor_add_format(ScreenPtr screen, int depth, CARD32 render_format, struct glamor_format *f = &glamor_priv->formats[depth]; bool texture_only = FALSE; + /** + * If this ever causes problems, we can fix this code then. + * + * The "error case" that this code is trying to prevent happens + * even when using GL contexts. + * + * From my testing, all this code does is forbid GLES contexts, + * which work just fine without this filter. + * + * See: https://gitlab.freedesktop.org/xorg/xserver/-/commit/8702c938b33b9ec180d64754eb922515c7c4a98b + * for the commit that introduced this code. + */ +#if 0 /* If we're trying to run on GLES, make sure that we get the read * formats that we're expecting, since glamor_transfer relies on * them matching to get data back out. To avoid this limitation, we @@ -530,6 +543,7 @@ glamor_add_format(ScreenPtr screen, int depth, CARD32 render_format, texture_only = TRUE; } } +#endif f->depth = depth; f->render_format = render_format;