From 3cd02f42452268207082bf25f4a14d66db9f35bc Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:10:32 +0200 Subject: [PATCH] treewide: replace PICT_FORMAT_VIS by PIXMAN_FORMAT_VIS Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult --- glamor/glamor_render.c | 2 +- render/picture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 7b6087d071..1052812d32 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -755,7 +755,7 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src, assert(src_bpp == PIXMAN_FORMAT_BPP(mask)); - new_vis = PICT_FORMAT_VIS(src) | PICT_FORMAT_VIS(mask); + new_vis = PIXMAN_FORMAT_VIS(src) | PIXMAN_FORMAT_VIS(mask); switch (in_ca) { case glamor_program_alpha_normal: diff --git a/render/picture.c b/render/picture.c index 6c4fe44f75..56e9b514cb 100644 --- a/render/picture.c +++ b/render/picture.c @@ -379,7 +379,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) case PICT_TYPE_GRAY: pFormats[f].type = PictTypeIndexed; pFormats[f].index.vid = - pScreen->visuals[PICT_FORMAT_VIS(format)].vid; + pScreen->visuals[PIXMAN_FORMAT_VIS(format)].vid; break; } }