mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
treewide: replace PICT_FORMAT by PIXMAN_FORMAT
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:
committed by
Enrico Weigelt
parent
3e5bb95a82
commit
8fb8ce515e
@@ -174,7 +174,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
|
||||
formats[nformats].format = PIXMAN_a1;
|
||||
formats[nformats].depth = 1;
|
||||
nformats++;
|
||||
formats[nformats].format = PICT_FORMAT(BitsPerPixel(8),
|
||||
formats[nformats].format = PIXMAN_FORMAT(BitsPerPixel(8),
|
||||
PIXMAN_TYPE_A, 8, 0, 0, 0);
|
||||
formats[nformats].depth = 8;
|
||||
nformats++;
|
||||
@@ -224,7 +224,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
|
||||
type = PIXMAN_TYPE_BGRA;
|
||||
}
|
||||
if (type != PIXMAN_TYPE_OTHER) {
|
||||
format = PICT_FORMAT(bpp, type, 0, r, g, b);
|
||||
format = PIXMAN_FORMAT(bpp, type, 0, r, g, b);
|
||||
addFormat(formats, &nformats, format, depth);
|
||||
}
|
||||
break;
|
||||
@@ -658,7 +658,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
|
||||
g = Ones(formats[n].direct.greenMask);
|
||||
b = Ones(formats[n].direct.blueMask);
|
||||
}
|
||||
formats[n].format = PICT_FORMAT(0, type, a, r, g, b);
|
||||
formats[n].format = PIXMAN_FORMAT(0, type, a, r, g, b);
|
||||
}
|
||||
PictureScreenPtr ps = calloc(1, sizeof(PictureScreenRec));
|
||||
if (!ps) {
|
||||
|
||||
Reference in New Issue
Block a user