diff options
-rw-r--r-- | src/radeon.h | 9 | ||||
-rw-r--r-- | src/radeon_accel.c | 2 | ||||
-rw-r--r-- | src/radeon_exa_funcs.c | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/radeon.h b/src/radeon.h index 39c61a2a..5d7190e5 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -542,14 +542,7 @@ extern unsigned eg_tile_split(unsigned tile_split); extern Bool radeon_transform_is_affine_or_scaled(PictTransformPtr t); /* radeon_exa_funcs.c */ -extern void RADEONCopyCP(PixmapPtr pDst, int srcX, int srcY, int dstX, - int dstY, int w, int h); -extern Bool RADEONDrawInitCP(ScreenPtr pScreen); -extern void RADEONDoPrepareCopyCP(ScrnInfoPtr pScrn, - uint32_t src_pitch_offset, - uint32_t dst_pitch_offset, - uint32_t datatype, int rop, - Pixel planemask); +extern Bool RADEONDrawInit(ScreenPtr pScreen); extern Bool R600DrawInit(ScreenPtr pScreen); extern Bool R600LoadShaders(ScrnInfoPtr pScrn); extern Bool EVERGREENDrawInit(ScreenPtr pScreen); diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 7832744e..16e81f33 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -222,7 +222,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen) if (!R600DrawInit(pScreen)) return FALSE; } else { - if (!RADEONDrawInitCP(pScreen)) + if (!RADEONDrawInit(pScreen)) return FALSE; } } diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index d3dba6fb..d1c7d1e1 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -197,7 +197,7 @@ RADEONSolid(PixmapPtr pPix, int x1, int y1, int x2, int y2) FINISH_ACCEL(); } -void +static void RADEONDoPrepareCopy(ScrnInfoPtr pScrn, uint32_t src_pitch_offset, uint32_t dst_pitch_offset, uint32_t datatype, int rop, Pixel planemask) @@ -275,7 +275,7 @@ RADEONPrepareCopy(PixmapPtr pSrc, PixmapPtr pDst, return TRUE; } -void +static void RADEONCopy(PixmapPtr pDst, int srcX, int srcY, int dstX, int dstY, |