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

treewide: replace PICT_TYPE_ABGR by PIXMAN_TYPE_ABGR

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:13:10 +02:00
committed by Enrico Weigelt
parent 900c893246
commit ba06904f10
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
glamor/glamor_render.c
View File

@@ -736,7 +736,7 @@ glamor_flush_composite_rects(ScreenPtr screen)
static const int pict_format_combine_tab[][3] = {
{PIXMAN_TYPE_ARGB, PICT_TYPE_A, PIXMAN_TYPE_ARGB},
{PICT_TYPE_ABGR, PICT_TYPE_A, PICT_TYPE_ABGR},
{PIXMAN_TYPE_ABGR, PICT_TYPE_A, PIXMAN_TYPE_ABGR},
};
static Bool

2
glamor/glamor_utils.h
View File

@@ -609,7 +609,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
rshift = gshift + gbits;
ashift = rshift + rbits;
}
else if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_ABGR) {
else if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_ABGR) {
rshift = 0;
gshift = rbits;
bshift = gshift + gbits;

6
render/picture.c
View File

@@ -216,7 +216,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
else if (pVisual->offsetRed == 0 &&
pVisual->offsetGreen == r &&
pVisual->offsetBlue == r + g) {
type = PICT_TYPE_ABGR;
type = PIXMAN_TYPE_ABGR;
}
else if (pVisual->offsetRed == pVisual->offsetGreen - r &&
pVisual->offsetGreen == pVisual->offsetBlue - g &&
@@ -317,7 +317,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
pFormats[f].direct.blue = 0;
break;
case PICT_TYPE_ABGR:
case PIXMAN_TYPE_ABGR:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.alphaMask = Mask (PIXMAN_FORMAT_A(format));
@@ -651,7 +651,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
else if (formats[n].direct.red > formats[n].direct.blue)
type = PIXMAN_TYPE_ARGB;
else if (formats[n].direct.red == 0)
type = PICT_TYPE_ABGR;
type = PIXMAN_TYPE_ABGR;
else
type = PICT_TYPE_BGRA;
a = Ones(formats[n].direct.alphaMask);