From b7367398920f01fa51c317b27fbd865d599c11a3 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:46:48 +0200 Subject: [PATCH] treewide: replace PICT_r5g6b5 by PIXMAN_r5g6b5 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.c | 2 +- glamor/glamor_picture.c | 2 +- render/picture.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exa/exa_render.c b/exa/exa_render.c index 7c7acfb44a..74b1916340 100644 --- a/exa/exa_render.c +++ b/exa/exa_render.c @@ -57,7 +57,7 @@ exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n) case PIXMAN_b8g8r8x8: snprintf(format, 20, "BGRX8888"); break; - case PICT_r5g6b5: + case PIXMAN_r5g6b5: snprintf(format, 20, "RGB565 "); break; case PICT_x1r5g5b5: diff --git a/glamor/glamor.c b/glamor/glamor.c index 63f96c7e0a..71e033f1b8 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -579,7 +579,7 @@ glamor_setup_formats(ScreenPtr screen) GL_RGBA, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, TRUE); } - glamor_add_format(screen, 16, PICT_r5g6b5, + glamor_add_format(screen, 16, PIXMAN_r5g6b5, GL_RGB, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, TRUE); if (glamor_priv->is_gles) { diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index 0f5cb62102..c539587b2e 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -158,7 +158,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen, } break; - case PICT_r5g6b5: + case PIXMAN_r5g6b5: *tex_format = GL_RGB; *tex_type = GL_UNSIGNED_SHORT_5_6_5; break; diff --git a/render/picture.c b/render/picture.c index e6028124f4..dab0796210 100644 --- a/render/picture.c +++ b/render/picture.c @@ -263,7 +263,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) if (pDepth->depth >= 16) { addFormat(formats, &nformats, PICT_a1r5g5b5, pDepth->depth); addFormat(formats, &nformats, PICT_a1b5g5r5, pDepth->depth); - addFormat(formats, &nformats, PICT_r5g6b5, pDepth->depth); + addFormat(formats, &nformats, PIXMAN_r5g6b5, pDepth->depth); addFormat(formats, &nformats, PICT_b5g6r5, pDepth->depth); addFormat(formats, &nformats, PICT_a4r4g4b4, pDepth->depth); addFormat(formats, &nformats, PICT_a4b4g4r4, pDepth->depth);