Add a DrawablePtr argument to the XV functions to pave the way for redirected

video.

3 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c2aba7d2..8ec0df5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
+
+	* src/i810_video.c: (I810PutImage):
+	* src/i830_video.c: (I830PutImage):
+	Add a DrawablePtr argument to the XV functions to pave the way for
+	redirected video.
+
 2006-04-05  Dave Airlie  <airlied@linux.ie>
 
 	* src/i810_hwmc.c: (I810XvMCCreateContext),
diff --git a/src/i810_video.c b/src/i810_video.c
index 769db0f2..e65a7f6d 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -76,7 +76,8 @@ static void I810QueryBestSize(ScrnInfoPtr, Bool,
 	short, short, short, short, unsigned int *, unsigned int *, pointer);
 static int I810PutImage( ScrnInfoPtr, 
 	short, short, short, short, short, short, short, short,
-	int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+	int, unsigned char*, short, short, Bool, RegionPtr, pointer,
+	DrawablePtr);
 static int I810QueryImageAttributes(ScrnInfoPtr, 
 	int, unsigned short *, unsigned short *,  int *, int *);
 
@@ -974,7 +975,8 @@ I810PutImage(
   int id, unsigned char* buf, 
   short width, short height, 
   Bool sync,
-  RegionPtr clipBoxes, pointer data
+  RegionPtr clipBoxes, pointer data,
+  DrawablePtr pDraw
 ){
     I810Ptr pI810 = I810PTR(pScrn);
     I810PortPrivPtr pPriv = (I810PortPrivPtr)data;
diff --git a/src/i830_video.c b/src/i830_video.c
index 7062d0f5..afdc99aa 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -108,7 +108,7 @@ static void I830QueryBestSize(ScrnInfoPtr, Bool,
 			      unsigned int *, pointer);
 static int I830PutImage(ScrnInfoPtr, short, short, short, short, short, short,
 			short, short, int, unsigned char *, short, short,
-			Bool, RegionPtr, pointer);
+			Bool, RegionPtr, pointer, DrawablePtr);
 static int I830QueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
 				    unsigned short *, int *, int *);
 
@@ -1876,7 +1876,8 @@ I830PutImage(ScrnInfoPtr pScrn,
 	     short drw_w, short drw_h,
 	     int id, unsigned char *buf,
 	     short width, short height,
-	     Bool sync, RegionPtr clipBoxes, pointer data)
+	     Bool sync, RegionPtr clipBoxes, pointer data,
+	     DrawablePtr pDraw)
 {
    I830Ptr pI830 = I830PTR(pScrn);
    I830PortPrivPtr pPriv = (I830PortPrivPtr) data;