mirror of
https://github.com/X11Libre/xserver.git
synced 2026-01-26 05:57:53 +00:00
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 <info@metux.net>
This commit is contained in:
parent
7783ae7723
commit
c2c19fc7fe
@ -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
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user