From 7939ec278db72419c9020e51bf0b8670d613d3f5 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:44:52 +0200 Subject: [PATCH] treewide: replace PICT_b8g8r8a8 by PIXMAN_b8g8r8a8 Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult --- exa/exa_render.c | 2 +- glamor/glamor_picture.c | 2 +- render/picture.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exa/exa_render.c b/exa/exa_render.c index cb2f1186d1..9f3557a751 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -51,7 +51,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n) case PIXMAN_x8r8g8b8: snprintf(format, 20, "XRGB8888"); break; - case PICT_b8g8r8a8: + case PIXMAN_b8g8r8a8: snprintf(format, 20, "BGRA8888"); break; case PICT_b8g8r8x8: diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index b30421fc63..d56760ee14 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -91,7 +91,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen, break; case PICT_b8g8r8x8: - case PICT_b8g8r8a8: + case PIXMAN_b8g8r8a8: if (!glamor_priv->is_gles) { *tex_format = GL_BGRA; *tex_type = GL_UNSIGNED_INT_8_8_8_8; diff --git a/render/picture.c b/render/picture.c index 4f29f3dc75..b0c4f2d34f 100644 --- a/render/picture.c +++ b/render/picture.c @@ -184,7 +184,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) formats[nformats].format = PIXMAN_x8r8g8b8; formats[nformats].depth = 32; nformats++; - formats[nformats].format = PICT_b8g8r8a8; + formats[nformats].format = PIXMAN_b8g8r8a8; formats[nformats].depth = 32; nformats++; formats[nformats].format = PICT_b8g8r8x8;