summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2006-04-07 23:11:06 +0000
committerAaron Plattner <aplattner@nvidia.com>2006-04-07 23:11:06 +0000
commitf793182898c4d844e9861a60a945f53ab7071adc (patch)
tree617f70cf2c85b4449e80eb57d7957c5a004d29a8
parentcb6b4073df7404822e2b553519c3a101f2ab0524 (diff)
downloadxorg-driver-xf86-video-nouveau-f793182898c4d844e9861a60a945f53ab7071adc.tar.gz
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
-rw-r--r--ChangeLog6
-rw-r--r--src/nv_video.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 42e6d78..4f3c170 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+
+ * src/nv_video.c: (NVPutImage):
+ 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/nv_video.c b/src/nv_video.c
index 9153112..c35bff0 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -80,7 +80,7 @@ static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer);
static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool);
static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool);
-static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer);
+static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr);
static void NVQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer);
static int NVQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *);
@@ -1004,7 +1004,8 @@ static int NVPutImage
short height,
Bool Sync,
RegionPtr clipBoxes,
- pointer data
+ pointer data,
+ DrawablePtr pDraw
)
{
NVPortPrivPtr pPriv = (NVPortPrivPtr)data;