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

treewide: replace PICT_TYPE_A by PIXMAN_TYPE_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 19:48:06 +02:00
committed by Enrico Weigelt
parent 71e2b20fe0
commit 9f4391203f
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exa/exa_render.c
View File

@@ -148,7 +148,7 @@ exaGetPixelFromRGBA(CARD32 *pixel,
*pixel = 0;
if (!PIXMAN_FORMAT_COLOR(pFormat->format) &&
PIXMAN_FORMAT_TYPE(pFormat->format) != PICT_TYPE_A)
PIXMAN_FORMAT_TYPE(pFormat->format) != PIXMAN_TYPE_A)
return FALSE;
int rbits = PIXMAN_FORMAT_R(pFormat->format);
@@ -179,7 +179,7 @@ exaGetRGBAFromPixel(CARD32 pixel,
{
int rshift, bshift, gshift, ashift;
if (!PIXMAN_FORMAT_COLOR(format) && PIXMAN_FORMAT_TYPE(format) != PICT_TYPE_A)
if (!PIXMAN_FORMAT_COLOR(format) && PIXMAN_FORMAT_TYPE(format) != PIXMAN_TYPE_A)
return FALSE;
int rbits = PIXMAN_FORMAT_R(format);

8
glamor/glamor_render.c
View File

@@ -735,8 +735,8 @@ glamor_flush_composite_rects(ScreenPtr screen)
}
static const int pict_format_combine_tab[][3] = {
{PIXMAN_TYPE_ARGB, PICT_TYPE_A, PIXMAN_TYPE_ARGB},
{PIXMAN_TYPE_ABGR, PICT_TYPE_A, PIXMAN_TYPE_ABGR},
{PIXMAN_TYPE_ARGB, PIXMAN_TYPE_A, PIXMAN_TYPE_ARGB},
{PIXMAN_TYPE_ABGR, PIXMAN_TYPE_A, PIXMAN_TYPE_ABGR},
};
static Bool
@@ -760,14 +760,14 @@ combine_pict_format(PictFormatShort * des, const PictFormatShort src,
switch (in_ca) {
case glamor_program_alpha_normal:
src_type = PIXMAN_FORMAT_TYPE(src);
mask_type = PICT_TYPE_A;
mask_type = PIXMAN_TYPE_A;
break;
case glamor_program_alpha_ca_first:
src_type = PIXMAN_FORMAT_TYPE(src);
mask_type = PIXMAN_FORMAT_TYPE(mask);
break;
case glamor_program_alpha_ca_second:
src_type = PICT_TYPE_A;
src_type = PIXMAN_TYPE_A;
mask_type = PIXMAN_FORMAT_TYPE(mask);
break;
case glamor_program_alpha_dual_blend:

2
glamor/glamor_utils.h
View File

@@ -600,7 +600,7 @@ glamor_get_rgba_from_pixel(CARD32 pixel,
int bbits = PIXMAN_FORMAT_B(format);
int abits = PIXMAN_FORMAT_A(format);
if (PIXMAN_FORMAT_TYPE(format) == PICT_TYPE_A) {
if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_A) {
rshift = gshift = bshift = ashift = 0;
}
else if (PIXMAN_FORMAT_TYPE(format) == PIXMAN_TYPE_ARGB) {

2
render/mipict.c
View File

@@ -444,7 +444,7 @@ miIsSolidAlpha(PicturePtr pSrc)
pScreen = pSrc->pDrawable->pScreen;
/* Alpha-only */
if (PIXMAN_FORMAT_TYPE(pSrc->format) != PICT_TYPE_A)
if (PIXMAN_FORMAT_TYPE(pSrc->format) != PIXMAN_TYPE_A)
return FALSE;
/* repeat */
if (!pSrc->repeat)

6
render/picture.c
View File

@@ -175,7 +175,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
formats[nformats].depth = 1;
nformats++;
formats[nformats].format = PICT_FORMAT(BitsPerPixel(8),
PICT_TYPE_A, 8, 0, 0, 0);
PIXMAN_TYPE_A, 8, 0, 0, 0);
formats[nformats].depth = 8;
nformats++;
formats[nformats].format = PICT_a8r8g8b8;
@@ -366,7 +366,7 @@ PictureCreateDefaultFormats(ScreenPtr pScreen, int *nformatp)
pFormats[f].direct.alpha = 0;
break;
case PICT_TYPE_A:
case PIXMAN_TYPE_A:
pFormats[f].type = PictTypeDirect;
pFormats[f].direct.alpha = 0;
@@ -647,7 +647,7 @@ PictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
else {
if ((formats[n].direct.redMask |
formats[n].direct.blueMask | formats[n].direct.greenMask) == 0)
type = PICT_TYPE_A;
type = PIXMAN_TYPE_A;
else if (formats[n].direct.red > formats[n].direct.blue)
type = PIXMAN_TYPE_ARGB;
else if (formats[n].direct.red == 0)