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_a8r8g8b8 by PIXMAN_a8r8g8b8

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:28:35 +02:00 • committed by Enrico Weigelt
commit df771ae3a0
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/evergreen_exa.c
View file

@ -672,7 +672,7 @@ static struct formatinfo EVERGREENTexFormats[] = {
{PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PIXMAN_a2b10g10r10, FMT_2_10_10_10},
{PIXMAN_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8},
{PIXMAN_a8r8g8b8, FMT_8_8_8_8},
{PICT_x8r8g8b8, FMT_8_8_8_8},
{PICT_a8b8g8r8, FMT_8_8_8_8},
{PICT_x8b8g8r8, FMT_8_8_8_8},
@ -733,7 +733,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_x2b10g10r10:
*dst_format = COLOR_2_10_10_10;
break;
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
@ -903,7 +903,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
switch (pPict->format) {
case PIXMAN_a2r10g10b10:
case PICT_a1r5g5b5:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
pix_r = SQ_SEL_Z; /* R */
pix_g = SQ_SEL_Y; /* G */
pix_b = SQ_SEL_X; /* B */
@ -1166,7 +1166,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
/* component swizzles */
switch (format) {
case PICT_a1r5g5b5:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
pix_r = zf; /* R */
pix_g = yf; /* G */
pix_b = xf; /* B */
@ -1441,7 +1441,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10:
case PIXMAN_x2r10g10b10:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a1r5g5b5:
case PICT_x1r5g5b5:

10
src/r600_exa.c
View file

@ -731,7 +731,7 @@ static struct formatinfo R600TexFormats[] = {
{PIXMAN_x2r10g10b10, FMT_2_10_10_10},
{PIXMAN_a2b10g10r10, FMT_2_10_10_10},
{PIXMAN_x2b10g10r10, FMT_2_10_10_10},
{PICT_a8r8g8b8, FMT_8_8_8_8},
{PIXMAN_a8r8g8b8, FMT_8_8_8_8},
{PICT_x8r8g8b8, FMT_8_8_8_8},
{PICT_a8b8g8r8, FMT_8_8_8_8},
{PICT_x8b8g8r8, FMT_8_8_8_8},
@ -792,7 +792,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
case PIXMAN_x2b10g10r10:
*dst_format = COLOR_2_10_10_10;
break;
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
@ -918,7 +918,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
switch (pPict->format) {
case PIXMAN_a2r10g10b10:
case PICT_a1r5g5b5:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
pix_r = SQ_SEL_Z; /* R */
pix_g = SQ_SEL_Y; /* G */
pix_b = SQ_SEL_X; /* B */
@ -1210,7 +1210,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
/* component swizzles */
switch (format) {
case PICT_a1r5g5b5:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
pix_r = zf; /* R */
pix_g = yf; /* G */
pix_b = xf; /* B */
@ -1480,7 +1480,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
switch (pDstPicture->format) {
case PIXMAN_a2r10g10b10:
case PIXMAN_x2r10g10b10:
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a1r5g5b5:
case PICT_x1r5g5b5:

12
src/radeon_exa_render.c
View file

@ -74,7 +74,7 @@ struct formatinfo {
* TXFORMAT_Y8 expands to (Y,Y,Y,1). TXFORMAT_I8 expands to (I,I,I,I)
*/
static struct formatinfo R100TexFormats[] = {
{PICT_a8r8g8b8, RADEON_TXFORMAT_ARGB8888 | RADEON_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_a8r8g8b8, RADEON_TXFORMAT_ARGB8888 | RADEON_TXFORMAT_ALPHA_IN_MAP},
{PICT_x8r8g8b8, RADEON_TXFORMAT_ARGB8888},
{PICT_r5g6b5, RADEON_TXFORMAT_RGB565},
{PICT_a1r5g5b5, RADEON_TXFORMAT_ARGB1555 | RADEON_TXFORMAT_ALPHA_IN_MAP},
@ -83,7 +83,7 @@ static struct formatinfo R100TexFormats[] = {
};
static struct formatinfo R200TexFormats[] = {
{PICT_a8r8g8b8, R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PIXMAN_a8r8g8b8, R200_TXFORMAT_ARGB8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PICT_x8r8g8b8, R200_TXFORMAT_ARGB8888},
{PICT_a8b8g8r8, R200_TXFORMAT_ABGR8888 | R200_TXFORMAT_ALPHA_IN_MAP},
{PICT_x8b8g8r8, R200_TXFORMAT_ABGR8888},
@ -94,7 +94,7 @@ static struct formatinfo R200TexFormats[] = {
};
static struct formatinfo R300TexFormats[] = {
{PICT_a8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8)},
{PIXMAN_a8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8)},
{PICT_x8r8g8b8, R300_EASY_TX_FORMAT(X, Y, Z, ONE, W8Z8Y8X8)},
{PICT_a8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, W, W8Z8Y8X8)},
{PICT_x8b8g8r8, R300_EASY_TX_FORMAT(Z, Y, X, ONE, W8Z8Y8X8)},
@ -111,7 +111,7 @@ static struct formatinfo R300TexFormats[] = {
static Bool RADEONGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
{
switch (pDstPicture->format) {
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
*dst_format = RADEON_COLOR_FORMAT_ARGB8888;
break;
@ -136,7 +136,7 @@ static Bool RADEONGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
static Bool R300GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
{
switch (pDstPicture->format) {
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
case PICT_a8b8g8r8:
case PICT_x8b8g8r8:
@ -1594,7 +1594,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
/* shader output swizzling */
switch (pDstPicture->format) {
case PICT_a8r8g8b8:
case PIXMAN_a8r8g8b8:
case PICT_x8r8g8b8:
default:
output_fmt = (R300_OUT_FMT_C4_8 |