diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/smi_video.c | 12 |
2 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-04-07 Aaron Plattner <aplattner@nvidia.com> + + * src/smi_video.c: (SMI_PutVideo), (SMI_PutImage): + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + 2006-04-07 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/src/smi_video.c b/src/smi_video.c index 67c58c0..1166c03 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -41,7 +41,7 @@ Author of changes: Corvin Zahn <zahn@zac.de> Date: 2.11.2001 */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.3 2004/07/31 01:21:51 anholt Exp $ */ +/* $XdotOrg: driver/xf86-video-siliconmotion/src/smi_video.c,v 1.5 2005/07/11 02:29:59 ajax Exp $ */ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */ #ifdef HAVE_CONFIG_H @@ -99,7 +99,7 @@ static void SMI_ResetVideo(ScrnInfoPtr pScrn); static int SMI_PutVideo(ScrnInfoPtr pScrn, short vid_x, short vid_y, short drw_x, short drw_y, short vid_w, short vid_h, short drw_w, short drw_h, - RegionPtr clipBoxes, pointer data); + RegionPtr clipBoxes, pointer data, DrawablePtr); #endif static void SMI_StopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown); static int SMI_SetPortAttribute(ScrnInfoPtr pScrn, Atom attribute, @@ -113,7 +113,7 @@ static int SMI_PutImage(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, int id, unsigned char *buf, short width, short height, Bool sync, - RegionPtr clipBoxes, pointer data); + RegionPtr clipBoxes, pointer data, DrawablePtr); static int SMI_QueryImageAttributes(ScrnInfoPtr pScrn, int id, unsigned short *width, unsigned short *height, int *picthes, int *offsets); @@ -1044,7 +1044,8 @@ SMI_PutVideo( short drw_w, short drw_h, RegionPtr clipBoxes, - pointer data + pointer data, + DrawablePtr pDraw ) { SMI_PortPtr pPort = (SMI_PortPtr) data; @@ -1588,7 +1589,8 @@ SMI_PutImage( short height, Bool sync, RegionPtr clipBoxes, - pointer data + pointer data, + DrawablePtr pDraw ) { SMIPtr pSmi = SMIPTR(pScrn); |