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_x2b10g10r10 by PIXMAN_x2b10g10r10

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:27:39 +02:00
committed by Enrico Weigelt
parent 19ae99e1b7
commit a9c6061d7b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/evergreen_exa.c
View File

@@ -671,7 +671,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_a2r10g10b10, FMT_2_10_10_10}, {PIXMAN_a2r10g10b10, FMT_2_10_10_10},
{PIXMAN_x2r10g10b10, FMT_2_10_10_10}, {PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PIXMAN_a2b10g10r10, FMT_2_10_10_10}, {PIXMAN_a2b10g10r10, FMT_2_10_10_10},
{PICT_x2b10g10r10, FMT_2_10_10_10}, {PIXMAN_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8}, {PICT_a8r8g8b8, FMT_8_8_8_8},
{PICT_x8r8g8b8, FMT_8_8_8_8}, {PICT_x8r8g8b8, FMT_8_8_8_8},
{PICT_a8b8g8r8, FMT_8_8_8_8}, {PICT_a8b8g8r8, FMT_8_8_8_8},
@@ -730,7 +730,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PIXMAN_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PIXMAN_a2b10g10r10: case PIXMAN_a2b10g10r10:
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
*dst_format = COLOR_2_10_10_10; *dst_format = COLOR_2_10_10_10;
break; break;
case PICT_a8r8g8b8: case PICT_a8r8g8b8:
@@ -916,7 +916,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_Z; /* B */ pix_b = SQ_SEL_Z; /* B */
pix_a = SQ_SEL_W; /* A */ pix_a = SQ_SEL_W; /* A */
break; break;
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
case PICT_x8b8g8r8: case PICT_x8b8g8r8:
pix_r = SQ_SEL_X; /* R */ pix_r = SQ_SEL_X; /* R */
pix_g = SQ_SEL_Y; /* G */ pix_g = SQ_SEL_Y; /* G */
@@ -1449,7 +1449,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
cb_conf.comp_swap = 1; /* ARGB */ cb_conf.comp_swap = 1; /* ARGB */
break; break;
case PIXMAN_a2b10g10r10: case PIXMAN_a2b10g10r10:
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
case PICT_a8b8g8r8: case PICT_a8b8g8r8:
case PICT_x8b8g8r8: case PICT_x8b8g8r8:
cb_conf.comp_swap = 0; /* ABGR */ cb_conf.comp_swap = 0; /* ABGR */

8
src/r600_exa.c
View File

@@ -730,7 +730,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_a2r10g10b10, FMT_2_10_10_10}, {PIXMAN_a2r10g10b10, FMT_2_10_10_10},
{PIXMAN_x2r10g10b10, FMT_2_10_10_10}, {PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PIXMAN_a2b10g10r10, FMT_2_10_10_10}, {PIXMAN_a2b10g10r10, FMT_2_10_10_10},
{PICT_x2b10g10r10, FMT_2_10_10_10}, {PIXMAN_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8}, {PICT_a8r8g8b8, FMT_8_8_8_8},
{PICT_x8r8g8b8, FMT_8_8_8_8}, {PICT_x8r8g8b8, FMT_8_8_8_8},
{PICT_a8b8g8r8, FMT_8_8_8_8}, {PICT_a8b8g8r8, FMT_8_8_8_8},
@@ -789,7 +789,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PIXMAN_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PIXMAN_a2b10g10r10: case PIXMAN_a2b10g10r10:
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
*dst_format = COLOR_2_10_10_10; *dst_format = COLOR_2_10_10_10;
break; break;
case PICT_a8r8g8b8: case PICT_a8r8g8b8:
@@ -931,7 +931,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_Z; /* B */ pix_b = SQ_SEL_Z; /* B */
pix_a = SQ_SEL_W; /* A */ pix_a = SQ_SEL_W; /* A */
break; break;
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
case PICT_x8b8g8r8: case PICT_x8b8g8r8:
pix_r = SQ_SEL_X; /* R */ pix_r = SQ_SEL_X; /* R */
pix_g = SQ_SEL_Y; /* G */ pix_g = SQ_SEL_Y; /* G */
@@ -1488,7 +1488,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
cb_conf.comp_swap = 1; /* ARGB */ cb_conf.comp_swap = 1; /* ARGB */
break; break;
case PIXMAN_a2b10g10r10: case PIXMAN_a2b10g10r10:
case PICT_x2b10g10r10: case PIXMAN_x2b10g10r10:
case PICT_a8b8g8r8: case PICT_a8b8g8r8:
case PICT_x8b8g8r8: case PICT_x8b8g8r8:
cb_conf.comp_swap = 0; /* ABGR */ cb_conf.comp_swap = 0; /* ABGR */