From ba06904f10f4d995092007dccd0020757fc88f08 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 19:13:10 +0200 Subject: [PATCH] treewide: replace PICT_TYPE_ABGR by PIXMAN_TYPE_ABGR 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 +- glamor/glamor_utils.h | 2 +- render/picture.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index ec83acefef..d5e3619b69 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -736,7 +736,7 @@ glamor_flush_composite_rects(ScreenPtr screen) static const int pict_format_combine_tab[][3] = { {PIXMAN_TYPE_ARGB, PICT_TYPE_A, PIXMAN_TYPE_ARGB}, - {PICT_TYPE_ABGR, PICT_TYPE_A, PICT_TYPE_ABGR}, + {PIXMAN_TYPE_ABGR, PICT_TYPE_A, PIXMAN_TYPE_ABGR}, }; static Bool diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h index 1cc86bf08c..c4fbb05be5 100644 --- a/glamor/glamor_utils.h +++ b/glamor/glamor_utils.h @@ -609,7 +609,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel, rshift = gshift + gbits; ashift = rshift + rbits; } - else if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_ABGR) { + else if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_ABGR) { rshift = 0; gshift = rbits; bshift = gshift + gbits; diff --git a/render/picture.c b/render/picture.c index 6aabc36d79..e44a809d42 100644 --- a/render/picture.c +++ b/render/picture.c @@ -216,7 +216,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) else if (pVisual->offsetRed == 0 && pVisual->offsetGreen == r && pVisual->offsetBlue == r + g) { - type = PICT_TYPE_ABGR; + type = PIXMAN_TYPE_ABGR; } else if (pVisual->offsetRed == pVisual->offsetGreen - r && pVisual->offsetGreen == pVisual->offsetBlue - g && @@ -317,7 +317,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp) pFormats[f].direct.blue = 0; break; - case PICT_TYPE_ABGR: + case PIXMAN_TYPE_ABGR: pFormats[f].type = PictTypeDirect; pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format)); @@ -651,7 +651,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) else if (formats[n].direct.red > formats[n].direct.blue) type = PIXMAN_TYPE_ARGB; else if (formats[n].direct.red == 0) - type = PICT_TYPE_ABGR; + type = PIXMAN_TYPE_ABGR; else type = PICT_TYPE_BGRA; a = Ones(formats[n].direct.alphaMask);