XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace PICT_FORMAT_A by PIXMAN_FORMAT_A

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:00:55 +02:00
committed by Enrico Weigelt
parent 97f3ff8c7e
commit ae1b649587
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
render/picture.c
View File

@@ -296,7 +296,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
case PICT_TYPE_ARGB:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.alphaMask = Mask (PICT_FORMAT_A(format));
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
if (pFormats[f].direct.alphaMask)
pFormats[f].direct.alpha = (PICT_FORMAT_R(format) +
@@ -320,7 +320,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
case PICT_TYPE_ABGR:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.alphaMask = Mask (PICT_FORMAT_A(format));
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
if (pFormats[f].direct.alphaMask)
pFormats[f].direct.alpha = (PICT_FORMAT_B(format) +
@@ -361,7 +361,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
(PICT_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
PICT_FORMAT_G(format) - PICT_FORMAT_R(format));
pFormats[f].direct.alphaMask = Mask (PICT_FORMAT_A(format));
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
pFormats[f].direct.alpha = 0;
break;
@@ -370,7 +370,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.alpha = 0;
pFormats[f].direct.alphaMask = Mask (PICT_FORMAT_A(format));
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
/* remaining fields already set to zero */
break;
@@ -1431,7 +1431,7 @@ ReduceCompositeOp(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
* picture.
*/
no_src_alpha = PICT_FORMAT_COLOR(pSrc->format) &&
PICT_FORMAT_A(pSrc->format) == 0 &&
PIXMAN_FORMAT_A(pSrc->format) == 0 &&
(pSrc->repeatType != RepeatNone ||
(!pSrc->transform &&
xSrc >= 0 && ySrc >= 0 &&
@@ -1439,7 +1439,7 @@ ReduceCompositeOp(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
ySrc + height <= pSrc->pDrawable->height)) &&
pSrc->alphaMap == NULL && pMask == NULL;
no_dst_alpha = PICT_FORMAT_COLOR(pDst->format) &&
PICT_FORMAT_A(pDst->format) == 0 && pDst->alphaMap == NULL;
PIXMAN_FORMAT_A(pDst->format) == 0 && pDst->alphaMap == NULL;
/* TODO, maybe: Conjoint and Disjoint op reductions? */