From d6143b8634e2d923456b3198e692ccb463d59952 Mon Sep 17 00:00:00 2001 From: Aaron Plattner Date: Fri, 21 Mar 2008 17:13:32 -0700 Subject: [PATCH] Get rid of fbPrepareAccess and fbFinishAccess, since the former was unused and neither one did anything anyway. --- pixman/pixman-compose.c | 13 ------------- pixman/pixman-pict.c | 46 ---------------------------------------------- pixman/pixman-private.h | 7 +------ pixman/pixman-trap.c | 2 -- 4 files changed, 1 insertion(+), 67 deletions(-) diff --git a/pixman/pixman-compose.c b/pixman/pixman-compose.c index 8c74d77..b75b461 100644 --- a/pixman/pixman-compose.c +++ b/pixman/pixman-compose.c @@ -1767,7 +1767,6 @@ static void fbFetchSolid(bits_image_t * pict, int x, int y, int width, uint32_t end = buffer + width; while (buffer < end) *(buffer++) = color; - fbFinishAccess (pict->pDrawable); } static void fbFetch(bits_image_t * pict, int x, int y, int width, uint32_t *buffer, uint32_t *mask, uint32_t maskBits) @@ -2977,10 +2976,7 @@ fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uint32_t *buffe if (pict->common.transform) { if (!pixman_transform_point_3d (pict->common.transform, &v)) - { - fbFinishAccess (pict->pDrawable); return; - } unit.vector[0] = pict->common.transform->matrix[0][0]; unit.vector[1] = pict->common.transform->matrix[1][0]; unit.vector[2] = pict->common.transform->matrix[2][0]; @@ -3038,8 +3034,6 @@ fbFetchTransformed(bits_image_t * pict, int x, int y, int width, uint32_t *buffe fbFetchTransformed_Convolution(pict, width, buffer, mask, maskBits, affine, v, unit); } - - fbFinishAccess (pict->pDrawable); } @@ -3088,7 +3082,6 @@ fbStore(bits_image_t * pict, int x, int y, int width, uint32_t *buffer) stride = pict->rowstride; bits += y*stride; store((pixman_image_t *)pict, bits, buffer, x, width, indexed); - fbFinishAccess (pict->pDrawable); } static void @@ -3127,9 +3120,6 @@ fbStoreExternalAlpha(bits_image_t * pict, int x, int y, int width, uint32_t *buf store((pixman_image_t *)pict, bits, buffer, x, width, indexed); astore((pixman_image_t *)pict->common.alpha_map, alpha_bits, buffer, ax - pict->common.alpha_origin.x, width, aindexed); - - fbFinishAccess (pict->alpha_map->pDrawable); - fbFinishAccess (pict->pDrawable); } typedef void (*scanStoreProc)(pixman_image_t *, int, int, int, uint32_t *); @@ -3428,9 +3418,6 @@ PIXMAN_COMPOSITE_RECT_GENERAL (const FbComposeData *data, } } } - - if (!store) - fbFinishAccess (data->dest->pDrawable); } #ifndef PIXMAN_FB_ACCESSORS diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c index e4430d1..366c444 100644 --- a/pixman/pixman-pict.c +++ b/pixman/pixman-pict.c @@ -149,9 +149,6 @@ fbCompositeOver_x888x8x8888 (pixman_op_t op, dst++; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } static void @@ -340,9 +337,6 @@ fbCompositeSolidMask_nx8x8888 (pixman_op_t op, dst++; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -416,9 +410,6 @@ fbCompositeSolidMask_nx8888x8888C (pixman_op_t op, dst++; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -481,9 +472,6 @@ fbCompositeSolidMask_nx8x0888 (pixman_op_t op, dst += 3; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -547,9 +535,6 @@ fbCompositeSolidMask_nx8x0565 (pixman_op_t op, dst++; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -623,9 +608,6 @@ fbCompositeSolidMask_nx8888x0565C (pixman_op_t op, dst++; } } - - fbFinishAccess (pMask->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -672,9 +654,6 @@ fbCompositeSrc_8888x8888 (pixman_op_t op, dst++; } } - - fbFinishAccess (pSrc->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -724,9 +703,6 @@ fbCompositeSrc_8888x0888 (pixman_op_t op, dst += 3; } } - - fbFinishAccess (pSrc->pDrawable); - fbFinishAccess (pDst->pDrawable); } void @@ -779,9 +755,6 @@ fbCompositeSrc_8888x0565 (pixman_op_t op, dst++; } } - - fbFinishAccess (pDst->pDrawable); - fbFinishAccess (pSrc->pDrawable); } void @@ -832,9 +805,6 @@ fbCompositeSrcAdd_8000x8000 (pixman_op_t op, dst++; } } - - fbFinishAccess (pDst->pDrawable); - fbFinishAccess (pSrc->pDrawable); } void @@ -892,9 +862,6 @@ fbCompositeSrcAdd_8888x8888 (pixman_op_t op, dst++; } } - - fbFinishAccess (pDst->pDrawable); - fbFinishAccess (pSrc->pDrawable); } static void @@ -947,9 +914,6 @@ fbCompositeSrcAdd_8888x8x8 (pixman_op_t op, WRITE(pDst, dst++, r); } } - - fbFinishAccess(pDst->pDrawable); - fbFinishAccess(pMask->pDrawable); } void @@ -997,8 +961,6 @@ fbCompositeSrcAdd_1000x1000 (pixman_op_t op, FALSE, FALSE); - fbFinishAccess(pDst->pDrawable); - fbFinishAccess(pSrc->pDrawable); #endif } @@ -1059,8 +1021,6 @@ fbCompositeSolidMask_nx1xn (pixman_op_t op, FB_ALLONES, 0x0); - fbFinishAccess (pDst->pDrawable); - fbFinishAccess (pMask->pDrawable); #endif } @@ -1131,9 +1091,6 @@ fbCompositeSrcSrc_nxn (pixman_op_t op, reverse, upsidedown); - - fbFinishAccess(pSrc->pDrawable); - fbFinishAccess(pDst->pDrawable); #endif } @@ -1210,9 +1167,6 @@ fbCompositeSrc_8888xx888 (pixman_op_t op, dst += dstStride; src += srcStride; } - - fbFinishAccess(pSrc->pDrawable); - fbFinishAccess(pDst->pDrawable); } static void diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h index 90ea4cb..a833b01 100644 --- a/pixman/pixman-private.h +++ b/pixman/pixman-private.h @@ -676,10 +676,6 @@ FASTCALL void pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int wi } \ } while (0) -/* FIXME */ -#define fbPrepareAccess(x) -#define fbFinishAccess(x) - #else #define READ(img, ptr) (*(ptr)) @@ -688,8 +684,7 @@ FASTCALL void pixman_fbCombineMaskU (uint32_t *src, const uint32_t *mask, int wi memcpy(dst, src, size) #define MEMSET_WRAPPED(img, dst, val, size) \ memset(dst, val, size) -#define fbPrepareAccess(x) -#define fbFinishAccess(x) + #endif #define fbComposeGetSolid(img, res, fmt) \ diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c index 468324e..0dca6cc 100644 --- a/pixman/pixman-trap.c +++ b/pixman/pixman-trap.c @@ -83,8 +83,6 @@ pixman_add_traps (pixman_image_t * image, } traps++; } - - fbFinishAccess (pPicture->pDrawable); } static void -- 2.7.4