mirror of
https://github.com/X11Libre/xf86-video-ati.git
synced 2026-03-23 17:19:27 +00:00
replace PICT_FORMAT_RGB() by PIXMAN_FORMAT_RGB()
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
0cc8ece58b
commit
fe76d2eda9
@@ -956,7 +956,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
|
||||
if (unit == 0) {
|
||||
if (!accel_state->msk_pic) {
|
||||
if (PICT_FORMAT_RGB(pPict->format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(pPict->format) == 0) {
|
||||
pix_r = SQ_SEL_0;
|
||||
pix_g = SQ_SEL_0;
|
||||
pix_b = SQ_SEL_0;
|
||||
@@ -982,7 +982,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
pix_a = SQ_SEL_1;
|
||||
}
|
||||
} else {
|
||||
if (PICT_FORMAT_RGB(pPict->format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(pPict->format) == 0) {
|
||||
pix_r = SQ_SEL_0;
|
||||
pix_g = SQ_SEL_0;
|
||||
pix_b = SQ_SEL_0;
|
||||
@@ -1216,7 +1216,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
|
||||
|
||||
if (unit == 0) {
|
||||
if (!accel_state->msk_pic) {
|
||||
if (PICT_FORMAT_RGB(format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(format) == 0) {
|
||||
pix_r = 0.0;
|
||||
pix_g = 0.0;
|
||||
pix_b = 0.0;
|
||||
@@ -1247,7 +1247,7 @@ static void EVERGREENSetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, u
|
||||
pix_a = 1.0;
|
||||
}
|
||||
} else {
|
||||
if (PICT_FORMAT_RGB(format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(format) == 0) {
|
||||
pix_r = 0;
|
||||
pix_g = 0;
|
||||
pix_b = 0;
|
||||
|
||||
@@ -971,7 +971,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
|
||||
if (unit == 0) {
|
||||
if (!accel_state->msk_pic) {
|
||||
if (PICT_FORMAT_RGB(pPict->format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(pPict->format) == 0) {
|
||||
pix_r = SQ_SEL_0;
|
||||
pix_g = SQ_SEL_0;
|
||||
pix_b = SQ_SEL_0;
|
||||
@@ -997,7 +997,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
|
||||
pix_a = SQ_SEL_1;
|
||||
}
|
||||
} else {
|
||||
if (PICT_FORMAT_RGB(pPict->format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(pPict->format) == 0) {
|
||||
pix_r = SQ_SEL_0;
|
||||
pix_g = SQ_SEL_0;
|
||||
pix_b = SQ_SEL_0;
|
||||
@@ -1260,7 +1260,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
|
||||
|
||||
if (unit == 0) {
|
||||
if (!accel_state->msk_pic) {
|
||||
if (PICT_FORMAT_RGB(format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(format) == 0) {
|
||||
pix_r = 0.0;
|
||||
pix_g = 0.0;
|
||||
pix_b = 0.0;
|
||||
@@ -1291,7 +1291,7 @@ static void R600SetSolidConsts(ScrnInfoPtr pScrn, float *buf, int format, uint32
|
||||
pix_a = 1.0;
|
||||
}
|
||||
} else {
|
||||
if (PICT_FORMAT_RGB(format) == 0) {
|
||||
if (PIXMAN_FORMAT_RGB(format) == 0) {
|
||||
pix_r = 0;
|
||||
pix_g = 0;
|
||||
pix_b = 0;
|
||||
|
||||
@@ -1627,7 +1627,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
|
||||
|
||||
/* setup pixel shader */
|
||||
if (IS_R300_3D) {
|
||||
if (PICT_FORMAT_RGB(pSrcPicture->format) == 0)
|
||||
if (PIXMAN_FORMAT_RGB(pSrcPicture->format) == 0)
|
||||
src_color = R300_ALU_RGB_0_0;
|
||||
else
|
||||
src_color = R300_ALU_RGB_SRC0_RGB;
|
||||
@@ -1805,7 +1805,7 @@ static Bool R300PrepareComposite(int op, PicturePtr pSrcPicture,
|
||||
R300_ALU_ALPHA_CLAMP));
|
||||
ADVANCE_RING();
|
||||
} else {
|
||||
if (PICT_FORMAT_RGB(pSrcPicture->format) == 0)
|
||||
if (PIXMAN_FORMAT_RGB(pSrcPicture->format) == 0)
|
||||
src_color = (R500_ALU_RGB_R_SWIZ_A_0 |
|
||||
R500_ALU_RGB_G_SWIZ_A_0 |
|
||||
R500_ALU_RGB_B_SWIZ_A_0);
|
||||
|
||||
Reference in New Issue
Block a user