mirror of
https://github.com/X11Libre/xf86-video-ati.git
synced 2026-03-23 17:19:27 +00:00
replace PICT_a2b10g10r10 by PIXMAN_a2b10g10r10
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:
committed by
Enrico Weigelt
parent
8e322df5aa
commit
19ae99e1b7
@@ -670,7 +670,7 @@ struct formatinfo {
|
||||
static struct formatinfo EVERGREENTexFormats[] = {
|
||||
{PIXMAN_a2r10g10b10, FMT_2_10_10_10},
|
||||
{PIXMAN_x2r10g10b10, FMT_2_10_10_10},
|
||||
{PICT_a2b10g10r10, FMT_2_10_10_10},
|
||||
{PIXMAN_a2b10g10r10, FMT_2_10_10_10},
|
||||
{PICT_x2b10g10r10, FMT_2_10_10_10},
|
||||
{PICT_a8r8g8b8, FMT_8_8_8_8},
|
||||
{PICT_x8r8g8b8, FMT_8_8_8_8},
|
||||
@@ -729,7 +729,7 @@ static Bool EVERGREENGetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
|
||||
switch (pDstPicture->format) {
|
||||
case PIXMAN_a2r10g10b10:
|
||||
case PIXMAN_x2r10g10b10:
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_x2b10g10r10:
|
||||
*dst_format = COLOR_2_10_10_10;
|
||||
break;
|
||||
@@ -909,7 +909,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
pix_b = SQ_SEL_X; /* B */
|
||||
pix_a = SQ_SEL_W; /* A */
|
||||
break;
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_a8b8g8r8:
|
||||
pix_r = SQ_SEL_X; /* R */
|
||||
pix_g = SQ_SEL_Y; /* G */
|
||||
@@ -1448,7 +1448,7 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
|
||||
default:
|
||||
cb_conf.comp_swap = 1; /* ARGB */
|
||||
break;
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_x2b10g10r10:
|
||||
case PICT_a8b8g8r8:
|
||||
case PICT_x8b8g8r8:
|
||||
|
||||
@@ -729,7 +729,7 @@ struct formatinfo {
|
||||
static struct formatinfo R600TexFormats[] = {
|
||||
{PIXMAN_a2r10g10b10, FMT_2_10_10_10},
|
||||
{PIXMAN_x2r10g10b10, FMT_2_10_10_10},
|
||||
{PICT_a2b10g10r10, FMT_2_10_10_10},
|
||||
{PIXMAN_a2b10g10r10, FMT_2_10_10_10},
|
||||
{PICT_x2b10g10r10, FMT_2_10_10_10},
|
||||
{PICT_a8r8g8b8, FMT_8_8_8_8},
|
||||
{PICT_x8r8g8b8, FMT_8_8_8_8},
|
||||
@@ -788,7 +788,7 @@ static Bool R600GetDestFormat(PicturePtr pDstPicture, uint32_t *dst_format)
|
||||
switch (pDstPicture->format) {
|
||||
case PIXMAN_a2r10g10b10:
|
||||
case PIXMAN_x2r10g10b10:
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_x2b10g10r10:
|
||||
*dst_format = COLOR_2_10_10_10;
|
||||
break;
|
||||
@@ -924,7 +924,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
pix_b = SQ_SEL_X; /* B */
|
||||
pix_a = SQ_SEL_W; /* A */
|
||||
break;
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_a8b8g8r8:
|
||||
pix_r = SQ_SEL_X; /* R */
|
||||
pix_g = SQ_SEL_Y; /* G */
|
||||
@@ -1487,7 +1487,7 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
|
||||
default:
|
||||
cb_conf.comp_swap = 1; /* ARGB */
|
||||
break;
|
||||
case PICT_a2b10g10r10:
|
||||
case PIXMAN_a2b10g10r10:
|
||||
case PICT_x2b10g10r10:
|
||||
case PICT_a8b8g8r8:
|
||||
case PICT_x8b8g8r8:
|
||||
|
||||
Reference in New Issue
Block a user