XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-23 17:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace PICT_x1r5g5b5 by PIXMAN_x1r5g5b5

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:48:13 +02:00
committed by Enrico Weigelt
parent 6ea8d8a5b1
commit 0af57eb200
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

@@ -680,7 +680,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_r5g6b5, FMT_5_6_5},
{PIXMAN_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
{PIXMAN_x1r5g5b5, FMT_1_5_5_5},
{PICT_a8, FMT_8},
};
@@ -745,7 +745,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
*dst_format = COLOR_5_6_5;
break;
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
*dst_format = COLOR_1_5_5_5;
break;
case PICT_a8:
@@ -936,7 +936,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_a = SQ_SEL_1; /* A */
break;
case PIXMAN_x2r10g10b10:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
case PIXMAN_x8r8g8b8:
case PIXMAN_r5g6b5:
pix_r = SQ_SEL_Z; /* R */
@@ -1196,7 +1196,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = wf; /* B */
pix_a = 1.0; /* A */
break;
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
case PIXMAN_x8r8g8b8:
case PIXMAN_r5g6b5:
pix_r = zf; /* R */
@@ -1444,7 +1444,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
default:
cb_conf.comp_swap = 1; /* ARGB */
break;

10
src/r600_exa.c
View File

@@ -739,7 +739,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_r5g6b5, FMT_5_6_5},
{PIXMAN_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
{PIXMAN_x1r5g5b5, FMT_1_5_5_5},
{PICT_a8, FMT_8},
};
@@ -804,7 +804,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
*dst_format = COLOR_5_6_5;
break;
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
*dst_format = COLOR_1_5_5_5;
break;
case PICT_a8:
@@ -951,7 +951,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_a = SQ_SEL_1; /* A */
break;
case PIXMAN_x2r10g10b10:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
case PIXMAN_x8r8g8b8:
case PIXMAN_r5g6b5:
pix_r = SQ_SEL_Z; /* R */
@@ -1240,7 +1240,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = wf; /* B */
pix_a = 1.0; /* A */
break;
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
case PIXMAN_x8r8g8b8:
case PIXMAN_r5g6b5:
pix_r = zf; /* R */
@@ -1483,7 +1483,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PIXMAN_a1r5g5b5:
case PICT_x1r5g5b5:
case PIXMAN_x1r5g5b5:
default:
cb_conf.comp_swap = 1; /* ARGB */
break;

10
src/radeon_exa_render.c
View File

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