XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Determine whether PutImage hooks take a DrawablePtr by server version. Remove

Browse Source 
dependency on xorg-server >= 1.0.99.901.
This commit is contained in:
Aaron Plattner
2006-04-27 10:32:10 -07:00
parent c34a93265c
commit 425e30d58b
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2006-04-27 Aaron Plattner <aplattner@nvidia.com>
* configure.ac:
* src/nv_video.c:
Determine whether PutImage hooks take a DrawablePtr by server version.
Remove dependency on xorg-server >= 1.0.99.901.
2006-04-25 Aaron Plattner <aplattner@nvidia.com>
* configure.ac:

7
configure.ac
View File

@@ -53,8 +53,13 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
# Determine whether XV PutImage takes a DrawablePtr
PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
[AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
[])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.

11
src/nv_video.c
View File

@@ -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;