Remove fast path code from fbpict.c
Remove the various fast path functions from fbpict, and instead use pixman_image_composite().
This commit is contained in:
		
							parent
							
								
									7e2c935920
								
							
						
					
					
						commit
						56fd927155
					
				
							
								
								
									
										1531
									
								
								fb/fbpict.c
								
								
								
								
							
							
						
						
									
										1531
									
								
								fb/fbpict.c
								
								
								
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										191
									
								
								fb/fbpict.h
								
								
								
								
							
							
						
						
									
										191
									
								
								fb/fbpict.h
								
								
								
								
							| 
						 | 
				
			
			@ -425,197 +425,6 @@ fbRasterizeEdges (FbBits	*buf,
 | 
			
		|||
		  xFixed	b);
 | 
			
		||||
 | 
			
		||||
/* fbpict.c */
 | 
			
		||||
CARD32
 | 
			
		||||
fbOver (CARD32 x, CARD32 y);
 | 
			
		||||
 | 
			
		||||
CARD32
 | 
			
		||||
fbOver24 (CARD32 x, CARD32 y);
 | 
			
		||||
 | 
			
		||||
CARD32
 | 
			
		||||
fbIn (CARD32 x, CARD8 y);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx8x8888 (CARD8      op,
 | 
			
		||||
			       PicturePtr pSrc,
 | 
			
		||||
			       PicturePtr pMask,
 | 
			
		||||
			       PicturePtr pDst,
 | 
			
		||||
			       INT16      xSrc,
 | 
			
		||||
			       INT16      ySrc,
 | 
			
		||||
			       INT16      xMask,
 | 
			
		||||
			       INT16      yMask,
 | 
			
		||||
			       INT16      xDst,
 | 
			
		||||
			       INT16      yDst,
 | 
			
		||||
			       CARD16     width,
 | 
			
		||||
			       CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx8x0888 (CARD8      op,
 | 
			
		||||
			       PicturePtr pSrc,
 | 
			
		||||
			       PicturePtr pMask,
 | 
			
		||||
			       PicturePtr pDst,
 | 
			
		||||
			       INT16      xSrc,
 | 
			
		||||
			       INT16      ySrc,
 | 
			
		||||
			       INT16      xMask,
 | 
			
		||||
			       INT16      yMask,
 | 
			
		||||
			       INT16      xDst,
 | 
			
		||||
			       INT16      yDst,
 | 
			
		||||
			       CARD16     width,
 | 
			
		||||
			       CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx8888x8888C (CARD8      op,
 | 
			
		||||
				   PicturePtr pSrc,
 | 
			
		||||
				   PicturePtr pMask,
 | 
			
		||||
				   PicturePtr pDst,
 | 
			
		||||
				   INT16      xSrc,
 | 
			
		||||
				   INT16      ySrc,
 | 
			
		||||
				   INT16      xMask,
 | 
			
		||||
				   INT16      yMask,
 | 
			
		||||
				   INT16      xDst,
 | 
			
		||||
				   INT16      yDst,
 | 
			
		||||
				   CARD16     width,
 | 
			
		||||
				   CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx8x0565 (CARD8      op,
 | 
			
		||||
			       PicturePtr pSrc,
 | 
			
		||||
			       PicturePtr pMask,
 | 
			
		||||
			       PicturePtr pDst,
 | 
			
		||||
			       INT16      xSrc,
 | 
			
		||||
			       INT16      ySrc,
 | 
			
		||||
			       INT16      xMask,
 | 
			
		||||
			       INT16      yMask,
 | 
			
		||||
			       INT16      xDst,
 | 
			
		||||
			       INT16      yDst,
 | 
			
		||||
			       CARD16     width,
 | 
			
		||||
			       CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx8888x0565C (CARD8      op,
 | 
			
		||||
				   PicturePtr pSrc,
 | 
			
		||||
				   PicturePtr pMask,
 | 
			
		||||
				   PicturePtr pDst,
 | 
			
		||||
				   INT16      xSrc,
 | 
			
		||||
				   INT16      ySrc,
 | 
			
		||||
				   INT16      xMask,
 | 
			
		||||
				   INT16      yMask,
 | 
			
		||||
				   INT16      xDst,
 | 
			
		||||
				   INT16      yDst,
 | 
			
		||||
				   CARD16     width,
 | 
			
		||||
				   CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrc_8888x8888 (CARD8      op,
 | 
			
		||||
			  PicturePtr pSrc,
 | 
			
		||||
			  PicturePtr pMask,
 | 
			
		||||
			  PicturePtr pDst,
 | 
			
		||||
			  INT16      xSrc,
 | 
			
		||||
			  INT16      ySrc,
 | 
			
		||||
			  INT16      xMask,
 | 
			
		||||
			  INT16      yMask,
 | 
			
		||||
			  INT16      xDst,
 | 
			
		||||
			  INT16      yDst,
 | 
			
		||||
			  CARD16     width,
 | 
			
		||||
			  CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrc_8888x0888 (CARD8      op,
 | 
			
		||||
			 PicturePtr pSrc,
 | 
			
		||||
			 PicturePtr pMask,
 | 
			
		||||
			 PicturePtr pDst,
 | 
			
		||||
			 INT16      xSrc,
 | 
			
		||||
			 INT16      ySrc,
 | 
			
		||||
			 INT16      xMask,
 | 
			
		||||
			 INT16      yMask,
 | 
			
		||||
			 INT16      xDst,
 | 
			
		||||
			 INT16      yDst,
 | 
			
		||||
			 CARD16     width,
 | 
			
		||||
			 CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrc_8888x0565 (CARD8      op,
 | 
			
		||||
			  PicturePtr pSrc,
 | 
			
		||||
			  PicturePtr pMask,
 | 
			
		||||
			  PicturePtr pDst,
 | 
			
		||||
			  INT16      xSrc,
 | 
			
		||||
			  INT16      ySrc,
 | 
			
		||||
			  INT16      xMask,
 | 
			
		||||
			  INT16      yMask,
 | 
			
		||||
			  INT16      xDst,
 | 
			
		||||
			  INT16      yDst,
 | 
			
		||||
			  CARD16     width,
 | 
			
		||||
			  CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrc_0565x0565 (CARD8      op,
 | 
			
		||||
			  PicturePtr pSrc,
 | 
			
		||||
			  PicturePtr pMask,
 | 
			
		||||
			  PicturePtr pDst,
 | 
			
		||||
			  INT16      xSrc,
 | 
			
		||||
			  INT16      ySrc,
 | 
			
		||||
			  INT16      xMask,
 | 
			
		||||
			  INT16      yMask,
 | 
			
		||||
			  INT16      xDst,
 | 
			
		||||
			  INT16      yDst,
 | 
			
		||||
			  CARD16     width,
 | 
			
		||||
			  CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrcAdd_8000x8000 (CARD8	op,
 | 
			
		||||
			     PicturePtr pSrc,
 | 
			
		||||
			     PicturePtr pMask,
 | 
			
		||||
			     PicturePtr pDst,
 | 
			
		||||
			     INT16      xSrc,
 | 
			
		||||
			     INT16      ySrc,
 | 
			
		||||
			     INT16      xMask,
 | 
			
		||||
			     INT16      yMask,
 | 
			
		||||
			     INT16      xDst,
 | 
			
		||||
			     INT16      yDst,
 | 
			
		||||
			     CARD16     width,
 | 
			
		||||
			     CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrcAdd_8888x8888 (CARD8	op,
 | 
			
		||||
			     PicturePtr pSrc,
 | 
			
		||||
			     PicturePtr pMask,
 | 
			
		||||
			     PicturePtr pDst,
 | 
			
		||||
			     INT16      xSrc,
 | 
			
		||||
			     INT16      ySrc,
 | 
			
		||||
			     INT16      xMask,
 | 
			
		||||
			     INT16      yMask,
 | 
			
		||||
			     INT16      xDst,
 | 
			
		||||
			     INT16      yDst,
 | 
			
		||||
			     CARD16     width,
 | 
			
		||||
			     CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSrcAdd_1000x1000 (CARD8	op,
 | 
			
		||||
			     PicturePtr pSrc,
 | 
			
		||||
			     PicturePtr pMask,
 | 
			
		||||
			     PicturePtr pDst,
 | 
			
		||||
			     INT16      xSrc,
 | 
			
		||||
			     INT16      ySrc,
 | 
			
		||||
			     INT16      xMask,
 | 
			
		||||
			     INT16      yMask,
 | 
			
		||||
			     INT16      xDst,
 | 
			
		||||
			     INT16      yDst,
 | 
			
		||||
			     CARD16     width,
 | 
			
		||||
			     CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbCompositeSolidMask_nx1xn (CARD8      op,
 | 
			
		||||
			    PicturePtr pSrc,
 | 
			
		||||
			    PicturePtr pMask,
 | 
			
		||||
			    PicturePtr pDst,
 | 
			
		||||
			    INT16      xSrc,
 | 
			
		||||
			    INT16      ySrc,
 | 
			
		||||
			    INT16      xMask,
 | 
			
		||||
			    INT16      yMask,
 | 
			
		||||
			    INT16      xDst,
 | 
			
		||||
			    INT16      yDst,
 | 
			
		||||
			    CARD16     width,
 | 
			
		||||
			    CARD16     height);
 | 
			
		||||
 | 
			
		||||
void
 | 
			
		||||
fbComposite (CARD8      op,
 | 
			
		||||
	     PicturePtr pSrc,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue