treewide: replace PICT_TYPE_BGRA by PIXMAN_TYPE_BGRA

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:14:17 +02:00
committed by Enrico Weigelt
parent ba06904f10
commit 71e2b20fe0
2 changed files with 4 additions and 4 deletions

View File

@@ -615,7 +615,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
bshift = gshift + gbits;
ashift = bshift + bbits;
}
else if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_BGRA) {
else if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_BGRA) {
ashift = 0;
rshift = abits;
if (abits == 0)

View File

@@ -221,7 +221,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
else if (pVisual->offsetRed == pVisual->offsetGreen - r &&
pVisual->offsetGreen == pVisual->offsetBlue - g &&
pVisual->offsetBlue == bpp - b) {
type = PICT_TYPE_BGRA;
type = PIXMAN_TYPE_BGRA;
}
if (type != PICT_TYPE_OTHER) {
format = PICT_FORMAT(bpp, type, 0, r, g, b);
@@ -341,7 +341,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
pFormats[f].direct.red = 0;
break;
case PICT_TYPE_BGRA:
case PIXMAN_TYPE_BGRA:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.blueMask = Mask (PIXMAN_FORMAT_B(format));
@@ -653,7 +653,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
else if (formats[n].direct.red == 0)
type = PIXMAN_TYPE_ABGR;
else
type = PICT_TYPE_BGRA;
type = PIXMAN_TYPE_BGRA;
a = Ones(formats[n].direct.alphaMask);
r = Ones(formats[n].direct.redMask);
g = Ones(formats[n].direct.greenMask);