hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-29 02:31:18 +00:00
Code Issues Projects Releases Wiki Activity

treewide: replace PICT_FORMAT_RGB by PIXMAN_FORMAT_RGB

Browse source 
Try not to use old compat macros anymore, use the real ones instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-08-05 18:50:06 +02:00 • committed by Enrico Weigelt
commit c2c19fc7fe
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
exa/exa_glyphs.c
View file

@ -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, /* All caches for a single format share a single pixmap for glyph storage,
* allowing mixing glyphs of different sizes without paying a penalty * allowing mixing glyphs of different sizes without paying a penalty

2
glamor/glamor_program.h
View file

@ -132,7 +132,7 @@ typedef struct {
static inline Bool static inline Bool
glamor_is_component_alpha(PicturePtr mask) { 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 TRUE;
return FALSE; return FALSE;
} }

2
glamor/glamor_render.c
View file

@ -550,7 +550,7 @@ glamor_set_composite_op(ScreenPtr screen,
break; break;
} }
} else if (mask && mask->componentAlpha } 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) { switch (dest_blend) {
case GL_SRC_ALPHA: case GL_SRC_ALPHA:
dest_blend = GL_SRC_COLOR; dest_blend = GL_SRC_COLOR;

2
render/glyph.c
View file

@ -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 void
CompositeGlyphs(CARD8 op, CompositeGlyphs(CARD8 op,

2
render/render.c
View file

@ -989,7 +989,7 @@ typedef struct _GlyphNew {
unsigned char sha1[20]; unsigned char sha1[20];
} GlyphNewRec, *GlyphNewPtr; } 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 static int
ProcRenderAddGlyphs(ClientPtr client) ProcRenderAddGlyphs(ClientPtr client)