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

replace PICT_x8b8g8r8 by PIXMAN_x8b8g8r8

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:39:36 +02:00
committed by Enrico Weigelt
parent d21e4e2f73
commit 41465c77a8
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/evergreen_exa.c
View File

@@ -675,7 +675,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_a8r8g8b8, FMT_8_8_8_8},
{PIXMAN_x8r8g8b8, FMT_8_8_8_8},
{PIXMAN_a8b8g8r8, FMT_8_8_8_8},
{PICT_x8b8g8r8, FMT_8_8_8_8},
{PIXMAN_x8b8g8r8, FMT_8_8_8_8},
{PICT_b8g8r8a8, FMT_8_8_8_8},
{PICT_b8g8r8x8, FMT_8_8_8_8},
{PICT_r5g6b5, FMT_5_6_5},
@@ -736,7 +736,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
case PICT_b8g8r8a8:
case PICT_b8g8r8x8:
*dst_format = COLOR_8_8_8_8;
@@ -917,7 +917,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_a = SQ_SEL_W; /* A */
break;
case PIXMAN_x2b10g10r10:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
pix_r = SQ_SEL_X; /* R */
pix_g = SQ_SEL_Y; /* G */
pix_b = SQ_SEL_Z; /* B */
@@ -1178,7 +1178,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = zf; /* B */
pix_a = wf; /* A */
break;
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
pix_r = xf; /* R */
pix_g = yf; /* G */
pix_b = zf; /* B */
@@ -1451,7 +1451,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_a2b10g10r10:
case PIXMAN_x2b10g10r10:
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
cb_conf.comp_swap = 0; /* ABGR */
break;
case PICT_b8g8r8a8:

10
src/r600_exa.c
View File

@@ -734,7 +734,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_a8r8g8b8, FMT_8_8_8_8},
{PIXMAN_x8r8g8b8, FMT_8_8_8_8},
{PIXMAN_a8b8g8r8, FMT_8_8_8_8},
{PICT_x8b8g8r8, FMT_8_8_8_8},
{PIXMAN_x8b8g8r8, FMT_8_8_8_8},
{PICT_b8g8r8a8, FMT_8_8_8_8},
{PICT_b8g8r8x8, FMT_8_8_8_8},
{PICT_r5g6b5, FMT_5_6_5},
@@ -795,7 +795,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
case PICT_b8g8r8a8:
case PICT_b8g8r8x8:
*dst_format = COLOR_8_8_8_8;
@@ -932,7 +932,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_a = SQ_SEL_W; /* A */
break;
case PIXMAN_x2b10g10r10:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
pix_r = SQ_SEL_X; /* R */
pix_g = SQ_SEL_Y; /* G */
pix_b = SQ_SEL_Z; /* B */
@@ -1222,7 +1222,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = zf; /* B */
pix_a = wf; /* A */
break;
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
pix_r = xf; /* R */
pix_g = yf; /* G */
pix_b = zf; /* B */
@@ -1490,7 +1490,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
case PIXMAN_a2b10g10r10:
case PIXMAN_x2b10g10r10:
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
cb_conf.comp_swap = 0; /* ABGR */
break;
case PICT_b8g8r8a8:

8
src/radeon_exa_render.c
View File

@@ -86,7 +86,7 @@ static struct formatinfo R200TexFormats[] = {
{PIXMAN_a8r8g8b8, R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_x8r8g8b8, R200_TXFORMAT_ARGB8888},
{PIXMAN_a8b8g8r8, R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PICT_x8b8g8r8, R200_TXFORMAT_ABGR8888},
{PIXMAN_x8b8g8r8, R200_TXFORMAT_ABGR8888},
{PICT_r5g6b5, R200_TXFORMAT_RGB565},
{PICT_a1r5g5b5, R200_TXFORMAT_ARGB1555 | R200_TXFORMAT_ALPHA_IN_MAP},
{PICT_x1r5g5b5, R200_TXFORMAT_ARGB1555},
@@ -97,7 +97,7 @@ static struct formatinfo R300TexFormats[] = {
{PIXMAN_a8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8)},
{PIXMAN_x8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8)},
{PIXMAN_a8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, W, W8Z8Y8X8)},
{PICT_x8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
{PIXMAN_x8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
{PICT_b8g8r8a8, R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
{PICT_b8g8r8x8, R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
{PICT_r5g6b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
@@ -139,7 +139,7 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8r8g8b8:
case PIXMAN_x8r8g8b8:
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
case PICT_b8g8r8a8:
case PICT_b8g8r8x8:
*dst_format = R300_COLORFORMAT_ARGB8888;
@@ -1604,7 +1604,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
R300_OUT_FMT_C3_SEL_ALPHA);
break;
case PIXMAN_a8b8g8r8:
case PICT_x8b8g8r8:
case PIXMAN_x8b8g8r8:
output_fmt = (R300_OUT_FMT_C4_8 |
R300_OUT_FMT_C0_SEL_RED |
R300_OUT_FMT_C1_SEL_GREEN |