From 3786a77ed3a1abb68821aa098a37031b51057048 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:45:33 +0200 Subject: [PATCH] treewide: replace PICT_b8g8r8x8 by PIXMAN_b8g8r8x8 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 9f3557a751..7c7acfb44a 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -54,7 +54,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n) case PIXMAN_b8g8r8a8: snprintf(format, 20, "BGRA8888"); break; - case PICT_b8g8r8x8: + case PIXMAN_b8g8r8x8: snprintf(format, 20, "BGRX8888"); break; case PICT_r5g6b5: diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index d56760ee14..0f5cb62102 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -90,7 +90,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen, *temp_format = PICT_a8; break; - case PICT_b8g8r8x8: + case PIXMAN_b8g8r8x8: case PIXMAN_b8g8r8a8: if (!glamor_priv->is_gles) { *tex_format = GL_BGRA; diff --git a/render/picture.c b/render/picture.c index b0c4f2d34f..e6028124f4 100644 --- a/render/picture.c +++ b/render/picture.c @@ -187,7 +187,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) formats[nformats].format = PIXMAN_b8g8r8a8; formats[nformats].depth = 32; nformats++; - formats[nformats].format = PICT_b8g8r8x8; + formats[nformats].format = PIXMAN_b8g8r8x8; formats[nformats].depth = 32; nformats++;