From c2c19fc7fe347b6ee798a596b8e79693dad36578 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 5 Aug 2025 18:50:06 +0200 Subject: [PATCH] treewide: replace PICT_FORMAT_RGB by PIXMAN_FORMAT_RGB Try not to use old compat macros anymore, use the real ones instead. Signed-off-by: Enrico Weigelt, metux IT consult --- exa/exa_glyphs.c | 2 +- glamor/glamor_program.h | 2 +- glamor/glamor_render.c | 2 +- render/glyph.c | 2 +- render/render.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exa/exa_glyphs.c b/exa/exa_glyphs.c index 86edf902b..1ea4a0c3d 100644 --- a/exa/exa_glyphs.c +++ b/exa/exa_glyphs.c @@ -138,7 +138,7 @@ exaUnrealizeGlyphCaches(ScreenPtr pScreen, unsigned int format) } } -#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) +#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PIXMAN_FORMAT_RGB(f) != 0) /* All caches for a single format share a single pixmap for glyph storage, * allowing mixing glyphs of different sizes without paying a penalty diff --git a/glamor/glamor_program.h b/glamor/glamor_program.h index 72bf1fc3f..9ce75f8c2 100644 --- a/glamor/glamor_program.h +++ b/glamor/glamor_program.h @@ -132,7 +132,7 @@ typedef struct { static inline Bool glamor_is_component_alpha(PicturePtr mask) { - if (mask && mask->componentAlpha && PICT_FORMAT_RGB(mask->format)) + if (mask && mask->componentAlpha && PIXMAN_FORMAT_RGB(mask->format)) return TRUE; return FALSE; } diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 8816e8b71..97a1ccf99 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -550,7 +550,7 @@ glamor_set_composite_op(ScreenPtr screen, break; } } else if (mask && mask->componentAlpha - && PICT_FORMAT_RGB(mask->format) != 0 && op_info->source_alpha) { + && PIXMAN_FORMAT_RGB(mask->format) != 0 && op_info->source_alpha) { switch (dest_blend) { case GL_SRC_ALPHA: dest_blend = GL_SRC_COLOR; diff --git a/render/glyph.c b/render/glyph.c index 8a68467e2..e87e42a07 100644 --- a/render/glyph.c +++ b/render/glyph.c @@ -542,7 +542,7 @@ GlyphExtents(int nlist, GlyphListPtr list, GlyphPtr * glyphs, BoxPtr extents) } } -#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) +#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PIXMAN_FORMAT_RGB(f) != 0) void CompositeGlyphs(CARD8 op, diff --git a/render/render.c b/render/render.c index b42d0ff6d..f09371cf4 100644 --- a/render/render.c +++ b/render/render.c @@ -989,7 +989,7 @@ typedef struct _GlyphNew { unsigned char sha1[20]; } GlyphNewRec, *GlyphNewPtr; -#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PICT_FORMAT_RGB(f) != 0) +#define NeedsComponent(f) (PIXMAN_FORMAT_A(f) != 0 && PIXMAN_FORMAT_RGB(f) != 0) static int ProcRenderAddGlyphs(ClientPtr client)