XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 05:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace PICT_FORMAT_COLOR by PIXMAN_FORMAT_COLOR

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 19:54:35 +02:00
committed by Enrico Weigelt
parent 3cd02f4245
commit f104c96091
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
exa/exa_render.c
View File

@@ -148,7 +148,7 @@ exaGetPixelFromRGBA(CARD32 *pixel,
*pixel = 0;
if (!PICT_FORMAT_COLOR(pFormat->format) &&
if (!PIXMAN_FORMAT_COLOR(pFormat->format) &&
PIXMAN_FORMAT_TYPE(pFormat->format) != PICT_TYPE_A)
return FALSE;
@@ -181,7 +181,7 @@ exaGetRGBAFromPixel(CARD32 pixel,
int rbits, bbits, gbits;
int rshift, bshift, gshift, ashift;
if (!PICT_FORMAT_COLOR(format) && PIXMAN_FORMAT_TYPE(format) != PICT_TYPE_A)
if (!PIXMAN_FORMAT_COLOR(format) && PIXMAN_FORMAT_TYPE(format) != PICT_TYPE_A)
return FALSE;
rbits = PICT_FORMAT_R(format);
@@ -903,8 +903,8 @@ exaComposite(CARD8 op,
else if (pSrc->pDrawable && !pSrc->transform &&
((op == PictOpSrc &&
(pSrc->format == pDst->format ||
(PICT_FORMAT_COLOR(pDst->format) &&
PICT_FORMAT_COLOR(pSrc->format) &&
(PIXMAN_FORMAT_COLOR(pDst->format) &&
PIXMAN_FORMAT_COLOR(pSrc->format) &&
pDst->format == PICT_FORMAT(PIXMAN_FORMAT_BPP(pSrc->format),
PIXMAN_FORMAT_TYPE(pSrc->format),
0,

4
glamor/glamor_render.c
View File

@@ -1549,8 +1549,8 @@ glamor_composite_clipped_region(CARD8 op,
&& dest->pDrawable->depth == source->pDrawable->depth
&& ((op == PictOpSrc
&& (source->format == dest->format
|| (PICT_FORMAT_COLOR(dest->format)
&& PICT_FORMAT_COLOR(source->format)
|| (PIXMAN_FORMAT_COLOR(dest->format)
&& PIXMAN_FORMAT_COLOR(source->format)
&& dest->format == PICT_FORMAT(PIXMAN_FORMAT_BPP(source->format),
PIXMAN_FORMAT_TYPE(source->format),
0,

4
render/picture.c
View File

@@ -1430,7 +1430,7 @@ ReduceCompositeOp(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
* simplest case where there is no transform on the source
* picture.
*/
no_src_alpha = PICT_FORMAT_COLOR(pSrc->format) &&
no_src_alpha = PIXMAN_FORMAT_COLOR(pSrc->format) &&
PIXMAN_FORMAT_A(pSrc->format) == 0 &&
(pSrc->repeatType != RepeatNone ||
(!pSrc->transform &&
@@ -1438,7 +1438,7 @@ ReduceCompositeOp(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
xSrc + width <= pSrc->pDrawable->width &&
ySrc + height <= pSrc->pDrawable->height)) &&
pSrc->alphaMap == NULL && pMask == NULL;
no_dst_alpha = PICT_FORMAT_COLOR(pDst->format) &&
no_dst_alpha = PIXMAN_FORMAT_COLOR(pDst->format) &&
PIXMAN_FORMAT_A(pDst->format) == 0 && pDst->alphaMap == NULL;
/* TODO, maybe: Conjoint and Disjoint op reductions? */