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_b8g8r8x8 by PIXMAN_b8g8r8x8

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:42:26 +02:00
commit 4328d4067f
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/evergreen_exa.c
View file

@ -677,7 +677,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_a8b8g8r8, FMT_8_8_8_8},
{PIXMAN_x8b8g8r8, FMT_8_8_8_8},
{PIXMAN_b8g8r8a8, FMT_8_8_8_8},
{PICT_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PICT_r5g6b5, FMT_5_6_5},
{PICT_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
@ -738,7 +738,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8b8g8r8:
case PIXMAN_x8b8g8r8:
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
*dst_format = COLOR_8_8_8_8;
break;
case PICT_r5g6b5:
@ -929,7 +929,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_W; /* B */
pix_a = SQ_SEL_X; /* A */
break;
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
pix_r = SQ_SEL_Y; /* R */
pix_g = SQ_SEL_Z; /* G */
pix_b = SQ_SEL_W; /* B */
@ -1190,7 +1190,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = wf; /* B */
pix_a = xf; /* A */
break;
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
pix_r = yf; /* R */
pix_g = zf; /* G */
pix_b = wf; /* B */
@ -1455,7 +1455,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
cb_conf.comp_swap = 0; /* ABGR */
break;
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
cb_conf.comp_swap = 3; /* BGRA */
break;
case PICT_r5g6b5:

10
src/r600_exa.c
View file

@ -736,7 +736,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_a8b8g8r8, FMT_8_8_8_8},
{PIXMAN_x8b8g8r8, FMT_8_8_8_8},
{PIXMAN_b8g8r8a8, FMT_8_8_8_8},
{PICT_b8g8r8x8, FMT_8_8_8_8},
{PIXMAN_b8g8r8x8, FMT_8_8_8_8},
{PICT_r5g6b5, FMT_5_6_5},
{PICT_a1r5g5b5, FMT_1_5_5_5},
{PICT_x1r5g5b5, FMT_1_5_5_5},
@ -797,7 +797,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8b8g8r8:
case PIXMAN_x8b8g8r8:
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
*dst_format = COLOR_8_8_8_8;
break;
case PICT_r5g6b5:
@ -944,7 +944,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_W; /* B */
pix_a = SQ_SEL_X; /* A */
break;
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
pix_r = SQ_SEL_Y; /* R */
pix_g = SQ_SEL_Z; /* G */
pix_b = SQ_SEL_W; /* B */
@ -1234,7 +1234,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = wf; /* B */
pix_a = xf; /* A */
break;
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
pix_r = yf; /* R */
pix_g = zf; /* G */
pix_b = wf; /* B */
@ -1494,7 +1494,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
cb_conf.comp_swap = 0; /* ABGR */
break;
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
cb_conf.comp_swap = 3; /* BGRA */
break;
case PICT_r5g6b5:

6
src/radeon_exa_render.c
View file

@ -99,7 +99,7 @@ static struct formatinfo R300TexFormats[] = {
{PIXMAN_a8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, W, W8Z8Y8X8)},
{PIXMAN_x8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
{PIXMAN_b8g8r8a8, R300_EASY_TX_FORMAT(W, Z, Y, X, W8Z8Y8X8)},
{PICT_b8g8r8x8, R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
{PIXMAN_b8g8r8x8, R300_EASY_TX_FORMAT(W, Z, Y, ONE, W8Z8Y8X8)},
{PICT_r5g6b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, Z5Y6X5)},
{PICT_a1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, W, W1Z5Y5X5)},
{PICT_x1r5g5b5, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W1Z5Y5X5)},
@ -141,7 +141,7 @@ static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a8b8g8r8:
case PIXMAN_x8b8g8r8:
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
*dst_format = R300_COLORFORMAT_ARGB8888;
break;
case PICT_r5g6b5:
@ -1612,7 +1612,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
R300_OUT_FMT_C3_SEL_ALPHA);
break;
case PIXMAN_b8g8r8a8:
case PICT_b8g8r8x8:
case PIXMAN_b8g8r8x8:
output_fmt = (R300_OUT_FMT_C4_8 |
R300_OUT_FMT_C0_SEL_ALPHA |
R300_OUT_FMT_C1_SEL_RED |