fb: Delete fbCompositeGeneral()
This function was an unused and trivial wrapper around fbComposite(). Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
This commit is contained in:
		
							parent
							
								
									74bc2d8c6b
								
							
						
					
					
						commit
						0dae479e16
					
				
							
								
								
									
										19
									
								
								fb/fbpict.c
								
								
								
								
							
							
						
						
									
										19
									
								
								fb/fbpict.c
								
								
								
								
							| 
						 | 
					@ -76,25 +76,6 @@ fbComposite (CARD8      op,
 | 
				
			||||||
    free_pixman_pict (pDst, dest);
 | 
					    free_pixman_pict (pDst, dest);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					 | 
				
			||||||
fbCompositeGeneral (CARD8	op,
 | 
					 | 
				
			||||||
		    PicturePtr	pSrc,
 | 
					 | 
				
			||||||
		    PicturePtr	pMask,
 | 
					 | 
				
			||||||
		    PicturePtr	pDst,
 | 
					 | 
				
			||||||
		    INT16	xSrc,
 | 
					 | 
				
			||||||
		    INT16	ySrc,
 | 
					 | 
				
			||||||
		    INT16	xMask,
 | 
					 | 
				
			||||||
		    INT16	yMask,
 | 
					 | 
				
			||||||
		    INT16	xDst,
 | 
					 | 
				
			||||||
		    INT16	yDst,
 | 
					 | 
				
			||||||
		    CARD16	width,
 | 
					 | 
				
			||||||
		    CARD16	height)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    fbComposite (op, pSrc, pMask, pDst,
 | 
					 | 
				
			||||||
			xSrc, ySrc, xMask, yMask, xDst, yDst,
 | 
					 | 
				
			||||||
			width, height);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
static pixman_image_t *
 | 
					static pixman_image_t *
 | 
				
			||||||
create_solid_fill_image (PicturePtr pict)
 | 
					create_solid_fill_image (PicturePtr pict)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										16
									
								
								fb/fbpict.h
								
								
								
								
							
							
						
						
									
										16
									
								
								fb/fbpict.h
								
								
								
								
							| 
						 | 
					@ -395,22 +395,6 @@ typedef struct _FbComposeFunctions {
 | 
				
			||||||
    CombineMaskU combineMaskU;
 | 
					    CombineMaskU combineMaskU;
 | 
				
			||||||
} FbComposeFunctions;
 | 
					} FbComposeFunctions;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* fbcompose.c */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
extern _X_EXPORT void
 | 
					 | 
				
			||||||
fbCompositeGeneral (CARD8	op,
 | 
					 | 
				
			||||||
		    PicturePtr	pSrc,
 | 
					 | 
				
			||||||
		    PicturePtr	pMask,
 | 
					 | 
				
			||||||
		    PicturePtr	pDst,
 | 
					 | 
				
			||||||
		    INT16	xSrc,
 | 
					 | 
				
			||||||
		    INT16	ySrc,
 | 
					 | 
				
			||||||
		    INT16	xMask,
 | 
					 | 
				
			||||||
		    INT16	yMask,
 | 
					 | 
				
			||||||
		    INT16	xDst,
 | 
					 | 
				
			||||||
		    INT16	yDst,
 | 
					 | 
				
			||||||
		    CARD16	width,
 | 
					 | 
				
			||||||
		    CARD16	height);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/* fbpict.c */
 | 
					/* fbpict.c */
 | 
				
			||||||
extern _X_EXPORT void
 | 
					extern _X_EXPORT void
 | 
				
			||||||
fbComposite (CARD8      op,
 | 
					fbComposite (CARD8      op,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue