diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-04-07 23:06:02 +0000 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-04-07 23:06:02 +0000 |
| commit | d706f494ed22afd369991e8c75a2d4f5aed15305 (patch) | |
| tree | cbdf16fe60928d3fe5c288f018397329b0531068 | |
| parent | f94685aec26b65f60c00a4b1bcd8f26bd80eb6e4 (diff) | |
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/atimach64xv.c | 3 | ||||
| -rw-r--r-- | src/r128_video.c | 5 | ||||
| -rw-r--r-- | src/radeon_video.c | 11 |
4 files changed, 20 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2006-04-07 Aaron Plattner <aplattner@nvidia.com> + + * src/atimach64xv.c: (ATIMach64PutImage): + * src/r128_video.c: (R128PutImage): + * src/radeon_video.c: (RADEONPutImage), (RADEONPutVideo): + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + 2006-04-04 Eric Anholt <anholt@FreeBSD.org> * man/ati.man: diff --git a/src/atimach64xv.c b/src/atimach64xv.c index 2ce4ce3..75cda6c 100644 --- a/src/atimach64xv.c +++ b/src/atimach64xv.c @@ -944,7 +944,8 @@ ATIMach64PutImage short Height, Bool Synchronise, RegionPtr pClip, - pointer Data + pointer Data, + DrawablePtr pDraw ) { ATIPtr pATI = Data; diff --git a/src/r128_video.c b/src/r128_video.c index 805aa0f..c814e49 100644 --- a/src/r128_video.c +++ b/src/r128_video.c @@ -37,7 +37,7 @@ static void R128QueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); static int R128PutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, - short, Bool, RegionPtr, pointer); + short, Bool, RegionPtr, pointer, DrawablePtr); static int R128QueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); @@ -771,7 +771,8 @@ R128PutImage( int id, unsigned char* buf, short width, short height, Bool Sync, - RegionPtr clipBoxes, pointer data + RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw ){ R128InfoPtr info = R128PTR(pScrn); R128PortPrivPtr pPriv = (R128PortPrivPtr)data; diff --git a/src/radeon_video.c b/src/radeon_video.c index 59434b3..8c92621 100644 --- a/src/radeon_video.c +++ b/src/radeon_video.c @@ -90,7 +90,8 @@ static void RADEONQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); static int RADEONPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, - short, Bool, RegionPtr, pointer); + short, Bool, RegionPtr, pointer, + DrawablePtr); static int RADEONQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); static void RADEONFreeMemory(ScrnInfoPtr pScrn, void *mem_struct); @@ -98,7 +99,7 @@ static void RADEONFreeMemory(ScrnInfoPtr pScrn, void *mem_struct); static void RADEONVideoTimerCallback(ScrnInfoPtr pScrn, Time now); static int RADEONPutVideo(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, - RegionPtr clipBoxes, pointer data); + RegionPtr clipBoxes, pointer data, DrawablePtr pDraw); static void RADEON_board_setmisc(RADEONPortPrivPtr pPriv); static void RADEON_RT_SetEncoding(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); @@ -2704,7 +2705,8 @@ RADEONPutImage( int id, unsigned char* buf, short width, short height, Bool Sync, - RegionPtr clipBoxes, pointer data + RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw ){ RADEONInfoPtr info = RADEONPTR(pScrn); RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data; @@ -3183,7 +3185,8 @@ RADEONPutVideo( short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, - RegionPtr clipBoxes, pointer data + RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw ){ RADEONInfoPtr info = RADEONPTR(pScrn); RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data; |