Commit e7f05c65 authored by Aaron Plattner's avatar Aaron Plattner

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

    redirected video.
parent fe557561
2006-04-07 Aaron Plattner <aplattner@nvidia.com>
* src/sis6326_video.c:
* src/sis_video.c: (SISPutImage):
* src/sis_video.h:
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:
......
/* $XFree86$ */
/* $XdotOrg$ */
/* $XdotOrg: driver/xf86-video-sis/src/sis6326_video.c,v 1.19 2005/10/16 18:12:32 twini Exp $ */
/*
* Xv driver for SiS 5597/5598, 6326 and 530/620.
*
......@@ -72,7 +72,8 @@ static void SIS6326QueryBestSize(ScrnInfoPtr, Bool, short, short, short,
short, unsigned int *,unsigned int *, pointer);
static int SIS6326PutImage( 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 SIS6326QueryImageAttributes(ScrnInfoPtr,
int, unsigned short *, unsigned short *, int *, int *);
static void SIS6326VideoTimerCallback(ScrnInfoPtr pScrn, Time now);
......@@ -1231,7 +1232,8 @@ SIS6326PutImage(
int id, unsigned char* buf,
short width, short height,
Bool sync,
RegionPtr clipBoxes, pointer data
RegionPtr clipBoxes, pointer data,
DrawablePtr pDraw
){
SISPtr pSiS = SISPTR(pScrn);
SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
......
/* $XFree86$ */
/* $XdotOrg$ */
/* $XdotOrg: driver/xf86-video-sis/src/sis_video.c,v 1.32 2005/09/23 16:34:04 twini Exp $ */
/*
* Xv driver for SiS 300, 315 and 330 series.
*
......@@ -3514,7 +3514,8 @@ SISPutImage(
int id, UChar *buf,
short width, short height,
Bool sync,
RegionPtr clipBoxes, pointer data
RegionPtr clipBoxes, pointer data,
DrawablePtr pDraw
){
SISPtr pSiS = SISPTR(pScrn);
SISPortPrivPtr pPriv = (SISPortPrivPtr)data;
......@@ -4196,7 +4197,8 @@ SISPutImageBlit(
int id, UChar *buf,
short width, short height,
Bool sync,
RegionPtr clipBoxes, ULong index
RegionPtr clipBoxes, ULong index,
DrawablePtr pDraw
){
SISPtr pSiS = SISPTR(pScrn);
SISBPortPrivPtr pPriv = (SISBPortPrivPtr)(pSiS->blitPriv);
......
/* $XFree86$ */
/* $XdotOrg$ */
/* $XdotOrg: driver/xf86-video-sis/src/sis_video.h,v 1.4 2005/07/04 10:57:08 twini Exp $ */
/*
* Xv driver for SiS 300, 315 and 330 series.
*
......@@ -107,7 +107,8 @@ static void SISQueryBestSize(ScrnInfoPtr, Bool, short, short, short,
short, unsigned int *,unsigned int *, pointer);
static int SISPutImage( ScrnInfoPtr,
short, short, short, short, short, short, short, short,
int, UChar *, short, short, Bool, RegionPtr, pointer);
int, UChar *, short, short, Bool, RegionPtr, pointer,
DrawablePtr);
static int SISQueryImageAttributes(ScrnInfoPtr,
int, UShort *, UShort *, int *, int *);
static void SISVideoTimerCallback(ScrnInfoPtr pScrn, Time now);
......@@ -129,7 +130,8 @@ static void SISQueryBestSizeBlit(ScrnInfoPtr, Bool, short, short, short,
short, unsigned int *,unsigned int *, ULong);
static int SISPutImageBlit( ScrnInfoPtr,
short, short, short, short, short, short, short, short,
int, UChar *, short, short, Bool, RegionPtr, ULong);
int, UChar *, short, short, Bool, RegionPtr, ULong,
DrawablePtr);
static int SISQueryImageAttributesBlit(ScrnInfoPtr,
int, UShort *, UShort *, int *, int *);
extern void SISWriteBlitPacket(SISPtr pSiS, CARD32 *packet);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment