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_x2r10g10b10 by PIXMAM_x2r10g10b10

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:22:42 +02:00
committed by Enrico Weigelt
parent 63e18adf5a
commit 8e322df5aa
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

@@ -669,7 +669,7 @@ struct formatinfo {
static struct formatinfo EVERGREENTexFormats[] = { static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_a2r10g10b10, FMT_2_10_10_10}, {PIXMAN_a2r10g10b10, FMT_2_10_10_10},
{PICT_x2r10g10b10, FMT_2_10_10_10}, {PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PICT_a2b10g10r10, FMT_2_10_10_10}, {PICT_a2b10g10r10, FMT_2_10_10_10},
{PICT_x2b10g10r10, FMT_2_10_10_10}, {PICT_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8}, {PICT_a8r8g8b8, FMT_8_8_8_8},
@@ -728,7 +728,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
{ {
switch (pDstPicture->format) { switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_a2b10g10r10: case PICT_a2b10g10r10:
case PICT_x2b10g10r10: case PICT_x2b10g10r10:
*dst_format = COLOR_2_10_10_10; *dst_format = COLOR_2_10_10_10;
@@ -935,7 +935,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_W; /* B */ pix_b = SQ_SEL_W; /* B */
pix_a = SQ_SEL_1; /* A */ pix_a = SQ_SEL_1; /* A */
break; break;
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_x1r5g5b5: case PICT_x1r5g5b5:
case PICT_x8r8g8b8: case PICT_x8r8g8b8:
case PICT_r5g6b5: case PICT_r5g6b5:
@@ -1440,7 +1440,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
switch (pDstPicture->format) { switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_a8r8g8b8: case PICT_a8r8g8b8:
case PICT_x8r8g8b8: case PICT_x8r8g8b8:
case PICT_a1r5g5b5: case PICT_a1r5g5b5:

8
src/r600_exa.c
View File

@@ -728,7 +728,7 @@ struct formatinfo {
static struct formatinfo R600TexFormats[] = { static struct formatinfo R600TexFormats[] = {
{PIXMAN_a2r10g10b10, FMT_2_10_10_10}, {PIXMAN_a2r10g10b10, FMT_2_10_10_10},
{PICT_x2r10g10b10, FMT_2_10_10_10}, {PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PICT_a2b10g10r10, FMT_2_10_10_10}, {PICT_a2b10g10r10, FMT_2_10_10_10},
{PICT_x2b10g10r10, FMT_2_10_10_10}, {PICT_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8}, {PICT_a8r8g8b8, FMT_8_8_8_8},
@@ -787,7 +787,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
{ {
switch (pDstPicture->format) { switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_a2b10g10r10: case PICT_a2b10g10r10:
case PICT_x2b10g10r10: case PICT_x2b10g10r10:
*dst_format = COLOR_2_10_10_10; *dst_format = COLOR_2_10_10_10;
@@ -950,7 +950,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_W; /* B */ pix_b = SQ_SEL_W; /* B */
pix_a = SQ_SEL_1; /* A */ pix_a = SQ_SEL_1; /* A */
break; break;
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_x1r5g5b5: case PICT_x1r5g5b5:
case PICT_x8r8g8b8: case PICT_x8r8g8b8:
case PICT_r5g6b5: case PICT_r5g6b5:
@@ -1479,7 +1479,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
switch (pDstPicture->format) { switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10: case PIXMAN_a2r10g10b10:
case PICT_x2r10g10b10: case PIXMAN_x2r10g10b10:
case PICT_a8r8g8b8: case PICT_a8r8g8b8:
case PICT_x8r8g8b8: case PICT_x8r8g8b8:
case PICT_a1r5g5b5: case PICT_a1r5g5b5: