From 19df33aa7a6f3ca5f0a360cd8475637cae26e03e Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 20:24:16 +0200 Subject: [PATCH] treewide: replace PICT_b5g6r5 by PIXMAN_b5g6r5 Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult --- glamor/glamor_picture.c | 2 +- render/picture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_picture.c b/glamor/glamor_picture.c index fb5d052786..1f40087a9a 100644 --- a/glamor/glamor_picture.c +++ b/glamor/glamor_picture.c @@ -162,7 +162,7 @@ glamor_get_tex_format_type_from_pictformat(ScreenPtr pScreen, *tex_format = GL_RGB; *tex_type = GL_UNSIGNED_SHORT_5_6_5; break; - case PICT_b5g6r5: + case PIXMAN_b5g6r5: *tex_format = GL_RGB; if (!glamor_priv->is_gles) { *tex_type = GL_UNSIGNED_SHORT_5_6_5_REV; diff --git a/render/picture.c b/render/picture.c index 075728cccd..6975303a9e 100644 --- a/render/picture.c +++ b/render/picture.c @@ -264,7 +264,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) addFormat(formats, &nformats, PICT_a1r5g5b5, pDepth->depth); addFormat(formats, &nformats, PICT_a1b5g5r5, pDepth->depth); addFormat(formats, &nformats, PIXMAN_r5g6b5, pDepth->depth); - addFormat(formats, &nformats, PICT_b5g6r5, pDepth->depth); + addFormat(formats, &nformats, PIXMAN_b5g6r5, pDepth->depth); addFormat(formats, &nformats, PICT_a4r4g4b4, pDepth->depth); addFormat(formats, &nformats, PICT_a4b4g4r4, pDepth->depth); }