diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-04-27 10:32:10 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-04-27 10:32:10 -0700 |
| commit | 425e30d58b7b62fff01fbb58585ee69b2df6fec1 (patch) | |
| tree | 4d967b47ed5e1689e1690987c455bfd74d4c4eab /src | |
| parent | c34a93265cb42168376ebdf0746b3ccded9f126c (diff) | |
Determine whether PutImage hooks take a DrawablePtr by server version. Remove
dependency on xorg-server >= 1.0.99.901.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nv_video.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/nv_video.c b/src/nv_video.c index c35bff0..33f3bb5 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -80,7 +80,12 @@ static int NVGetBlitPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer); static void NVStopOverlayVideo(ScrnInfoPtr, pointer, Bool); static void NVStopBlitVideo(ScrnInfoPtr, pointer, Bool); +#if HAVE_XV_DRAWABLE static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer, DrawablePtr); +#else +static int NVPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, short, short, Bool, RegionPtr, pointer); +#endif + 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,8 +1009,10 @@ static int NVPutImage short height, Bool Sync, RegionPtr clipBoxes, - pointer data, - DrawablePtr pDraw + pointer data +#if HAVE_XV_DRAWABLE + , DrawablePtr pDraw +#endif ) { NVPortPrivPtr pPriv = (NVPortPrivPtr)data; |