summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2006-04-07 23:10:36 +0000
committerAaron Plattner <aplattner@nvidia.com>2006-04-07 23:10:36 +0000
commit61bdc4d2c00945c3cc5b257b7f7fb9290cf3acca (patch)
tree05f3e5608674978aa8118990bb707d6a479b3399
parentbec305f962c8133e33c9c835f416ac55777231f3 (diff)
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
-rw-r--r--ChangeLog7
-rw-r--r--src/nsc_gx1_video.c5
-rw-r--r--src/nsc_gx2_video.c5
3 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a0eee8..6bdcba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-07 Aaron Plattner <aplattner@nvidia.com>
+
+ * src/nsc_gx1_video.c: (GX1PutImage):
+ * src/nsc_gx2_video.c: (GX2PutImage):
+ 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/nsc_gx1_video.c b/src/nsc_gx1_video.c
index ec54416..8c29bdf 100644
--- a/src/nsc_gx1_video.c
+++ b/src/nsc_gx1_video.c
@@ -192,7 +192,7 @@ static void GX1QueryBestSize(ScrnInfoPtr, Bool,
static int GX1PutImage(ScrnInfoPtr,
short, short, short, short, short, short,
short, short, int, unsigned char *, short, short,
- Bool, RegionPtr, pointer);
+ Bool, RegionPtr, pointer, DrawablePtr);
static int GX1QueryImageAttributes(ScrnInfoPtr,
int, unsigned short *, unsigned short *,
int *, int *);
@@ -1082,7 +1082,8 @@ GX1PutImage(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)
{
GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
GeodePtr pGeode = GEODEPTR(pScrn);
diff --git a/src/nsc_gx2_video.c b/src/nsc_gx2_video.c
index 79b58a1..d09a2a0 100644
--- a/src/nsc_gx2_video.c
+++ b/src/nsc_gx2_video.c
@@ -189,7 +189,7 @@ static void GX2QueryBestSize(ScrnInfoPtr, Bool,
unsigned int *, pointer);
static int GX2PutImage(ScrnInfoPtr, short, short, short, short, short, short,
short, short, int, unsigned char *, short, short, Bool,
- RegionPtr, pointer);
+ RegionPtr, pointer, DrawablePtr);
static int GX2QueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
unsigned short *, int *, int *);
@@ -1017,7 +1017,8 @@ GX2PutImage(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)
{
GeodePortPrivPtr pPriv = (GeodePortPrivPtr) data;
GeodePtr pGeode = GEODEPTR(pScrn);