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_FORMAT_A() by PIXMAN_FORMAT_A()

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:52:33 +02:00
committed by Enrico Weigelt
parent a867f5e6d6
commit 0cc8ece58b
3 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/evergreen_exa.c
View File

@@ -694,7 +694,7 @@ static uint32_t EVERGREENGetBlendCntl(int op, PicturePtr pMask, uint32_t dst_for
/* If there's no dst alpha channel, adjust the blend op so that we'll treat /* If there's no dst alpha channel, adjust the blend op so that we'll treat
* it as always 1. * it as always 1.
*/ */
if (PICT_FORMAT_A(dst_format) == 0 && EVERGREENBlendOp[op].dst_alpha) { if (PIXMAN_FORMAT_A(dst_format) == 0 && EVERGREENBlendOp[op].dst_alpha) {
if (sblend == (BLEND_DST_ALPHA << COLOR_SRCBLEND_shift)) if (sblend == (BLEND_DST_ALPHA << COLOR_SRCBLEND_shift))
sblend = (BLEND_ONE << COLOR_SRCBLEND_shift); sblend = (BLEND_ONE << COLOR_SRCBLEND_shift);
else if (sblend == (BLEND_ONE_MINUS_DST_ALPHA << COLOR_SRCBLEND_shift)) else if (sblend == (BLEND_ONE_MINUS_DST_ALPHA << COLOR_SRCBLEND_shift))
@@ -787,8 +787,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
* clipping. * clipping.
*/ */
/* FIXME evergreen */ /* FIXME evergreen */
if (pPict->transform != 0 && repeatType == RepeatNone && PICT_FORMAT_A(pPict->format) == 0) { if (pPict->transform != 0 && repeatType == RepeatNone && PIXMAN_FORMAT_A(pPict->format) == 0) {
if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0))) if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PIXMAN_FORMAT_A(pDstPict->format) == 0)))
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
} }
@@ -962,12 +962,12 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_0; pix_b = SQ_SEL_0;
} }
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (accel_state->src_alpha) { if (accel_state->src_alpha) {
if (PICT_FORMAT_A(pPict->format) == 0) { if (PIXMAN_FORMAT_A(pPict->format) == 0) {
pix_r = SQ_SEL_1; pix_r = SQ_SEL_1;
pix_g = SQ_SEL_1; pix_g = SQ_SEL_1;
pix_b = SQ_SEL_1; pix_b = SQ_SEL_1;
@@ -978,7 +978,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = pix_a; pix_b = pix_a;
} }
} else { } else {
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} }
} else { } else {
@@ -988,16 +988,16 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_0; pix_b = SQ_SEL_0;
} }
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} }
} }
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} else { } else {
if (PICT_FORMAT_A(pPict->format) == 0) { if (PIXMAN_FORMAT_A(pPict->format) == 0) {
pix_r = SQ_SEL_1; pix_r = SQ_SEL_1;
pix_g = SQ_SEL_1; pix_g = SQ_SEL_1;
pix_b = SQ_SEL_1; pix_b = SQ_SEL_1;
@@ -1222,7 +1222,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = 0.0; pix_b = 0.0;
} }
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
@@ -1232,7 +1232,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b / pix_a, pix_a / pix_a }; pix_b / pix_a, pix_a / pix_a };
evergreen_set_blend_color(pScrn, cblend); evergreen_set_blend_color(pScrn, cblend);
if (PICT_FORMAT_A(format) == 0) { if (PIXMAN_FORMAT_A(format) == 0) {
pix_r = 1.0; pix_r = 1.0;
pix_g = 1.0; pix_g = 1.0;
pix_b = 1.0; pix_b = 1.0;
@@ -1243,7 +1243,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = pix_a; pix_b = pix_a;
} }
} else { } else {
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} }
} else { } else {
@@ -1253,16 +1253,16 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
pix_b = 0; pix_b = 0;
} }
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} }
} }
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} else { } else {
if (PICT_FORMAT_A(format) == 0) { if (PIXMAN_FORMAT_A(format) == 0) {
pix_r = 1.0; pix_r = 1.0;
pix_g = 1.0; pix_g = 1.0;
pix_b = 1.0; pix_b = 1.0;

30
src/r600_exa.c
View File

@@ -753,7 +753,7 @@ static uint32_t R600GetBlendCntl(int op, PicturePtr pMask, uint32_t dst_format)
/* If there's no dst alpha channel, adjust the blend op so that we'll treat /* If there's no dst alpha channel, adjust the blend op so that we'll treat
* it as always 1. * it as always 1.
*/ */
if (PICT_FORMAT_A(dst_format) == 0 && R600BlendOp[op].dst_alpha) { if (PIXMAN_FORMAT_A(dst_format) == 0 && R600BlendOp[op].dst_alpha) {
if (sblend == (BLEND_DST_ALPHA << COLOR_SRCBLEND_shift)) if (sblend == (BLEND_DST_ALPHA << COLOR_SRCBLEND_shift))
sblend = (BLEND_ONE << COLOR_SRCBLEND_shift); sblend = (BLEND_ONE << COLOR_SRCBLEND_shift);
else if (sblend == (BLEND_ONE_MINUS_DST_ALPHA << COLOR_SRCBLEND_shift)) else if (sblend == (BLEND_ONE_MINUS_DST_ALPHA << COLOR_SRCBLEND_shift))
@@ -846,8 +846,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
* clipping. * clipping.
*/ */
/* FIXME R6xx */ /* FIXME R6xx */
if (pPict->transform != 0 && repeatType == RepeatNone && PICT_FORMAT_A(pPict->format) == 0) { if (pPict->transform != 0 && repeatType == RepeatNone && PIXMAN_FORMAT_A(pPict->format) == 0) {
if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0))) if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PIXMAN_FORMAT_A(pDstPict->format) == 0)))
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
} }
@@ -977,12 +977,12 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_0; pix_b = SQ_SEL_0;
} }
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (accel_state->src_alpha) { if (accel_state->src_alpha) {
if (PICT_FORMAT_A(pPict->format) == 0) { if (PIXMAN_FORMAT_A(pPict->format) == 0) {
pix_r = SQ_SEL_1; pix_r = SQ_SEL_1;
pix_g = SQ_SEL_1; pix_g = SQ_SEL_1;
pix_b = SQ_SEL_1; pix_b = SQ_SEL_1;
@@ -993,7 +993,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = pix_a; pix_b = pix_a;
} }
} else { } else {
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} }
} else { } else {
@@ -1003,16 +1003,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
pix_b = SQ_SEL_0; pix_b = SQ_SEL_0;
} }
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} }
} }
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (PICT_FORMAT_A(pPict->format) == 0) if (PIXMAN_FORMAT_A(pPict->format) == 0)
pix_a = SQ_SEL_1; pix_a = SQ_SEL_1;
} else { } else {
if (PICT_FORMAT_A(pPict->format) == 0) { if (PIXMAN_FORMAT_A(pPict->format) == 0) {
pix_r = SQ_SEL_1; pix_r = SQ_SEL_1;
pix_g = SQ_SEL_1; pix_g = SQ_SEL_1;
pix_b = SQ_SEL_1; pix_b = SQ_SEL_1;
@@ -1266,7 +1266,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = 0.0; pix_b = 0.0;
} }
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
@@ -1276,7 +1276,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b / pix_a, pix_a / pix_a }; pix_b / pix_a, pix_a / pix_a };
r600_set_blend_color(pScrn, cblend); r600_set_blend_color(pScrn, cblend);
if (PICT_FORMAT_A(format) == 0) { if (PIXMAN_FORMAT_A(format) == 0) {
pix_r = 1.0; pix_r = 1.0;
pix_g = 1.0; pix_g = 1.0;
pix_b = 1.0; pix_b = 1.0;
@@ -1287,7 +1287,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = pix_a; pix_b = pix_a;
} }
} else { } else {
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} }
} else { } else {
@@ -1297,16 +1297,16 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
pix_b = 0; pix_b = 0;
} }
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} }
} }
} else { } else {
if (accel_state->component_alpha) { if (accel_state->component_alpha) {
if (PICT_FORMAT_A(format) == 0) if (PIXMAN_FORMAT_A(format) == 0)
pix_a = 1.0; pix_a = 1.0;
} else { } else {
if (PICT_FORMAT_A(format) == 0) { if (PIXMAN_FORMAT_A(format) == 0) {
pix_r = 1.0; pix_r = 1.0;
pix_g = 1.0; pix_g = 1.0;
pix_b = 1.0; pix_b = 1.0;

30
src/radeon_exa_render.c
View File

@@ -171,7 +171,7 @@ static uint32_t RADEONGetBlendCntl(int op, PicturePtr pMask, uint32_t dst_format
/* If there's no dst alpha channel, adjust the blend op so that we'll treat /* If there's no dst alpha channel, adjust the blend op so that we'll treat
* it as always 1. * it as always 1.
*/ */
if (PICT_FORMAT_A(dst_format) == 0 && RadeonBlendOp[op].dst_alpha) { if (PIXMAN_FORMAT_A(dst_format) == 0 && RadeonBlendOp[op].dst_alpha) {
if (sblend == RADEON_SRC_BLEND_GL_DST_ALPHA) if (sblend == RADEON_SRC_BLEND_GL_DST_ALPHA)
sblend = RADEON_SRC_BLEND_GL_ONE; sblend = RADEON_SRC_BLEND_GL_ONE;
else if (sblend == RADEON_SRC_BLEND_GL_ONE_MINUS_DST_ALPHA) else if (sblend == RADEON_SRC_BLEND_GL_ONE_MINUS_DST_ALPHA)
@@ -334,8 +334,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
* matter. I have not, however, verified that the X server always does such * matter. I have not, however, verified that the X server always does such
* clipping. * clipping.
*/ */
if (pPict->transform != 0 && repeatType == RepeatNone && PICT_FORMAT_A(pPict->format) == 0) { if (pPict->transform != 0 && repeatType == RepeatNone && PIXMAN_FORMAT_A(pPict->format) == 0) {
if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0))) if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PIXMAN_FORMAT_A(pDstPict->format) == 0)))
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
} }
@@ -731,8 +731,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
* matter. I have not, however, verified that the X server always does such * matter. I have not, however, verified that the X server always does such
* clipping. * clipping.
*/ */
if (pPict->transform != 0 && repeatType == RepeatNone && PICT_FORMAT_A(pPict->format) == 0) { if (pPict->transform != 0 && repeatType == RepeatNone && PIXMAN_FORMAT_A(pPict->format) == 0) {
if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0))) if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PIXMAN_FORMAT_A(pDstPict->format) == 0)))
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
} }
@@ -1113,8 +1113,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
* matter. I have not, however, verified that the X server always does such * matter. I have not, however, verified that the X server always does such
* clipping. * clipping.
*/ */
if (pPict->transform != 0 && repeatType == RepeatNone && PICT_FORMAT_A(pPict->format) == 0) { if (pPict->transform != 0 && repeatType == RepeatNone && PIXMAN_FORMAT_A(pPict->format) == 0) {
if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PICT_FORMAT_A(pDstPict->format) == 0))) if (!(((op == PictOpSrc) || (op == PictOpClear)) && (PIXMAN_FORMAT_A(pDstPict->format) == 0)))
RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n")); RADEON_FALLBACK(("REPEAT_NONE unsupported for transformed xRGB source\n"));
} }
@@ -1632,7 +1632,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
else else
src_color = R300_ALU_RGB_SRC0_RGB; src_color = R300_ALU_RGB_SRC0_RGB;
if (PICT_FORMAT_A(pSrcPicture->format) == 0) if (PIXMAN_FORMAT_A(pSrcPicture->format) == 0)
src_alpha = R300_ALU_ALPHA_1_0; src_alpha = R300_ALU_ALPHA_1_0;
else else
src_alpha = R300_ALU_ALPHA_SRC0_A; src_alpha = R300_ALU_ALPHA_SRC0_A;
@@ -1640,7 +1640,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
if (pMask) { if (pMask) {
if (pMaskPicture->componentAlpha) { if (pMaskPicture->componentAlpha) {
if (RadeonBlendOp[op].src_alpha) { if (RadeonBlendOp[op].src_alpha) {
if (PICT_FORMAT_A(pSrcPicture->format) == 0) if (PIXMAN_FORMAT_A(pSrcPicture->format) == 0)
src_color = R300_ALU_RGB_1_0; src_color = R300_ALU_RGB_1_0;
else else
src_color = R300_ALU_RGB_SRC0_AAA; src_color = R300_ALU_RGB_SRC0_AAA;
@@ -1648,12 +1648,12 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
src_color = R300_ALU_RGB_SRC0_RGB; src_color = R300_ALU_RGB_SRC0_RGB;
mask_color = R300_ALU_RGB_SRC1_RGB; mask_color = R300_ALU_RGB_SRC1_RGB;
} else { } else {
if (PICT_FORMAT_A(pMaskPicture->format) == 0) if (PIXMAN_FORMAT_A(pMaskPicture->format) == 0)
mask_color = R300_ALU_RGB_1_0; mask_color = R300_ALU_RGB_1_0;
else else
mask_color = R300_ALU_RGB_SRC1_AAA; mask_color = R300_ALU_RGB_SRC1_AAA;
} }
if (PICT_FORMAT_A(pMaskPicture->format) == 0) if (PIXMAN_FORMAT_A(pMaskPicture->format) == 0)
mask_alpha = R300_ALU_ALPHA_1_0; mask_alpha = R300_ALU_ALPHA_1_0;
else else
mask_alpha = R300_ALU_ALPHA_SRC1_A; mask_alpha = R300_ALU_ALPHA_SRC1_A;
@@ -1814,7 +1814,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
R500_ALU_RGB_G_SWIZ_A_G | R500_ALU_RGB_G_SWIZ_A_G |
R500_ALU_RGB_B_SWIZ_A_B); R500_ALU_RGB_B_SWIZ_A_B);
if (PICT_FORMAT_A(pSrcPicture->format) == 0) if (PIXMAN_FORMAT_A(pSrcPicture->format) == 0)
src_alpha = R500_ALPHA_SWIZ_A_1; src_alpha = R500_ALPHA_SWIZ_A_1;
else else
src_alpha = R500_ALPHA_SWIZ_A_A; src_alpha = R500_ALPHA_SWIZ_A_A;
@@ -1822,7 +1822,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
if (pMask) { if (pMask) {
if (pMaskPicture->componentAlpha) { if (pMaskPicture->componentAlpha) {
if (RadeonBlendOp[op].src_alpha) { if (RadeonBlendOp[op].src_alpha) {
if (PICT_FORMAT_A(pSrcPicture->format) == 0) if (PIXMAN_FORMAT_A(pSrcPicture->format) == 0)
src_color = (R500_ALU_RGB_R_SWIZ_A_1 | src_color = (R500_ALU_RGB_R_SWIZ_A_1 |
R500_ALU_RGB_G_SWIZ_A_1 | R500_ALU_RGB_G_SWIZ_A_1 |
R500_ALU_RGB_B_SWIZ_A_1); R500_ALU_RGB_B_SWIZ_A_1);
@@ -1839,7 +1839,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
R500_ALU_RGB_G_SWIZ_B_G | R500_ALU_RGB_G_SWIZ_B_G |
R500_ALU_RGB_B_SWIZ_B_B); R500_ALU_RGB_B_SWIZ_B_B);
} else { } else {
if (PICT_FORMAT_A(pMaskPicture->format) == 0) if (PIXMAN_FORMAT_A(pMaskPicture->format) == 0)
mask_color = (R500_ALU_RGB_R_SWIZ_B_1 | mask_color = (R500_ALU_RGB_R_SWIZ_B_1 |
R500_ALU_RGB_G_SWIZ_B_1 | R500_ALU_RGB_G_SWIZ_B_1 |
R500_ALU_RGB_B_SWIZ_B_1); R500_ALU_RGB_B_SWIZ_B_1);
@@ -1848,7 +1848,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
R500_ALU_RGB_G_SWIZ_B_A | R500_ALU_RGB_G_SWIZ_B_A |
R500_ALU_RGB_B_SWIZ_B_A); R500_ALU_RGB_B_SWIZ_B_A);
} }
if (PICT_FORMAT_A(pMaskPicture->format) == 0) if (PIXMAN_FORMAT_A(pMaskPicture->format) == 0)
mask_alpha = R500_ALPHA_SWIZ_B_1; mask_alpha = R500_ALPHA_SWIZ_B_1;
else else
mask_alpha = R500_ALPHA_SWIZ_B_A; mask_alpha = R500_ALPHA_SWIZ_B_A;