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_B by PIXMAN_FORMAT_B

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 20:02:10 +02:00
committed by Enrico Weigelt
parent ca118c9793
commit 600b46c7c1
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
render/picture.c
View File

@@ -301,18 +301,18 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
if (pFormats[f].direct.alphaMask)
pFormats[f].direct.alpha = (PIXMAN_FORMAT_R(format) +
PIXMAN_FORMAT_G(format) +
PICT_FORMAT_B(format));
PIXMAN_FORMAT_B(format));
pFormats[f].direct.redMask = Mask (PIXMAN_FORMAT_R(format));
pFormats[f].direct.red = (PIXMAN_FORMAT_G(format) +
PICT_FORMAT_B(format));
PIXMAN_FORMAT_B(format));
pFormats[f].direct.greenMask = Mask (PIXMAN_FORMAT_G(format));
pFormats[f].direct.green = PICT_FORMAT_B(format);
pFormats[f].direct.green = PIXMAN_FORMAT_B(format);
pFormats[f].direct.blueMask = Mask (PICT_FORMAT_B(format));
pFormats[f].direct.blueMask = Mask (PIXMAN_FORMAT_B(format));
pFormats[f].direct.blue = 0;
break;
@@ -323,11 +323,11 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
if (pFormats[f].direct.alphaMask)
pFormats[f].direct.alpha = (PICT_FORMAT_B(format) +
pFormats[f].direct.alpha = (PIXMAN_FORMAT_B(format) +
PIXMAN_FORMAT_G(format) +
PIXMAN_FORMAT_R(format));
pFormats[f].direct.blueMask = Mask (PICT_FORMAT_B(format));
pFormats[f].direct.blueMask = Mask (PIXMAN_FORMAT_B(format));
pFormats[f].direct.blue = (PIXMAN_FORMAT_G(format) +
PIXMAN_FORMAT_R(format));
@@ -344,21 +344,21 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
case PICT_TYPE_BGRA:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.blueMask = Mask (PICT_FORMAT_B(format));
pFormats[f].direct.blueMask = Mask (PIXMAN_FORMAT_B(format));
pFormats[f].direct.blue =
(PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format));
(PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format));
pFormats[f].direct.greenMask = Mask (PIXMAN_FORMAT_G(format));
pFormats[f].direct.green =
(PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
(PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format) -
PIXMAN_FORMAT_G(format));
pFormats[f].direct.redMask = Mask (PIXMAN_FORMAT_R(format));
pFormats[f].direct.red =
(PIXMAN_FORMAT_BPP(format) - PICT_FORMAT_B(format) -
(PIXMAN_FORMAT_BPP(format) - PIXMAN_FORMAT_B(format) -
PIXMAN_FORMAT_G(format) - PIXMAN_FORMAT_R(format));
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));