daemonratte/xf86-video-ati
Watch
1
0
Fork
You've already forked xf86-video-ati
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace PICT_a1r5g5b5 by PIXMAN_a1r5g5b5

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 17:46:42 +02:00 • committed by Enrico Weigelt
commit 6ea8d8a5b1
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/evergreen_exa.c
View file

@ -679,7 +679,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_b8g8r8a8, FMT_8_8_8_8},
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_r5g6b5, FMT_5_6_5},
{PICT_a1r5g5b5, FMT_1_5_5_5},
{PIXMAN_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
{PICT_a8, FMT_8},
};
@ -744,7 +744,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_r5g6b5:
*dst_format = COLOR_5_6_5;
break;
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
*dst_format = COLOR_1_5_5_5;
break;
@ -902,7 +902,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
/* component swizzles */
switch (pPict->format) {
case PIXMAN_a2r10g10b10:
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PIXMAN_a8r8g8b8:
pix_r = SQ_SEL_Z; /* R */
pix_g = SQ_SEL_Y; /* G */
@ -1165,7 +1165,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
/* component swizzles */
switch (format) {
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PIXMAN_a8r8g8b8:
pix_r = zf; /* R */
pix_g = yf; /* G */
@ -1443,7 +1443,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_x2r10g10b10:
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
default:
cb_conf.comp_swap = 1; /* ARGB */

10
src/r600_exa.c
View file

@ -738,7 +738,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_b8g8r8a8, FMT_8_8_8_8},
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_r5g6b5, FMT_5_6_5},
{PICT_a1r5g5b5, FMT_1_5_5_5},
{PIXMAN_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
{PICT_a8, FMT_8},
};
@ -803,7 +803,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_r5g6b5:
*dst_format = COLOR_5_6_5;
break;
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
*dst_format = COLOR_1_5_5_5;
break;
@ -917,7 +917,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
/* component swizzles */
switch (pPict->format) {
case PIXMAN_a2r10g10b10:
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PIXMAN_a8r8g8b8:
pix_r = SQ_SEL_Z; /* R */
pix_g = SQ_SEL_Y; /* G */
@ -1209,7 +1209,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
/* component swizzles */
switch (format) {
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PIXMAN_a8r8g8b8:
pix_r = zf; /* R */
pix_g = yf; /* G */
@ -1482,7 +1482,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_x2r10g10b10:
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
default:
cb_conf.comp_swap = 1; /* ARGB */

10
src/radeon_exa_render.c
View file

@ -77,7 +77,7 @@ static struct formatinfo R100TexFormats[] = {
{PIXMAN_a8r8g8b8, RADEON_TXFORMAT_ARGB8888 | RADEON_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_x8r8g8b8, RADEON_TXFORMAT_ARGB8888},
{PIXMAN_r5g6b5, RADEON_TXFORMAT_RGB565},
{PICT_a1r5g5b5, RADEON_TXFORMAT_ARGB1555 | RADEON_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_a1r5g5b5, RADEON_TXFORMAT_ARGB1555 | RADEON_TXFORMAT_ALPHA_IN_MAP},
{PICT_x1r5g5b5, RADEON_TXFORMAT_ARGB1555},
{PICT_a8, RADEON_TXFORMAT_I8 | RADEON_TXFORMAT_ALPHA_IN_MAP},
};
@ -88,7 +88,7 @@ static struct formatinfo R200TexFormats[] = {
{PIXMAN_a8b8g8r8, R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_x8b8g8r8, R200_TXFORMAT_ABGR8888},
{PIXMAN_r5g6b5, R200_TXFORMAT_RGB565},
{PICT_a1r5g5b5, R200_TXFORMAT_ARGB1555 | R200_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_a1r5g5b5, R200_TXFORMAT_ARGB1555 | R200_TXFORMAT_ALPHA_IN_MAP},
{PICT_x1r5g5b5, R200_TXFORMAT_ARGB1555},
{PICT_a8, R200_TXFORMAT_I8 | R200_TXFORMAT_ALPHA_IN_MAP},
};
@ -101,7 +101,7 @@ static struct formatinfo R300TexFormats[] = {
{PIXMAN_b8g8r8a8, R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
{PIXMAN_b8g8r8x8, R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
{PIXMAN_r5g6b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
{PICT_a1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)},
{PIXMAN_a1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)},
{PICT_x1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W1Z5Y5X5)},
{PICT_a8, R300_EASY_TX_FORMAT(ZERO, ZERO, ZERO, X, X8)},
};
@ -118,7 +118,7 @@ static Bool RADEONGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_r5g6b5:
*dst_format = RADEON_COLOR_FORMAT_RGB565;
break;
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
*dst_format = RADEON_COLOR_FORMAT_ARGB1555;
break;
@ -147,7 +147,7 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_r5g6b5:
*dst_format = R300_COLORFORMAT_RGB565;
break;
case PICT_a1r5g5b5:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
*dst_format = R300_COLORFORMAT_ARGB1555;
break;