xf86-video-nv: 2 commits - ChangeLog configure.ac src/nv_include.h src/nv_local.h src/nv_video.c src/riva_include.h src/riva_local.h
Aaron Plattner
aplattner at kemper.freedesktop.org
Sat Apr 29 02:46:25 EEST 2006
ChangeLog | 17 +++++++++++++++++
configure.ac | 8 +++++++-
src/nv_include.h | 5 +++++
src/nv_local.h | 3 +++
src/nv_video.c | 14 ++++++++++++--
src/riva_include.h | 5 +++++
src/riva_local.h | 3 +++
7 files changed, 52 insertions(+), 3 deletions(-)
New commits:
diff-tree 1a40c4a79b79034d191496726a27af8b0805dba6 (from 425e30d58b7b62fff01fbb58585ee69b2df6fec1)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Thu Apr 27 18:10:37 2006 -0700
Add the libcwrapper back, conditionalized on the server version.
diff --git a/ChangeLog b/ChangeLog
index a32ce89..1df8806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2006-04-27 Aaron Plattner <aplattner at nvidia.com>
* configure.ac:
+ * src/nv_include.h:
+ * src/nv_local.h:
+ * src/nv_video.c:
+ * src/riva_include.h:
+ * src/riva_local.h:
+ Add the libcwrapper back, conditionalized on the server version.
+
+2006-04-27 Aaron Plattner <aplattner at 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.
diff --git a/configure.ac b/configure.ac
index 8f44298..31637e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,10 +53,11 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Determine whether XV PutImage takes a DrawablePtr
+# Determine whether XV PutImage takes a DrawablePtr and whether or not to use
+# the libcwrapper.
PKG_CHECK_EXISTS([xorg-server >= 1.0.99.901],
[AC_DEFINE(HAVE_XV_DRAWABLE,1,[XV hooks take a DrawablePtr])],
- [])
+ [AC_DEFINE(USE_LIBC_WRAPPER,1,[Use the libc wrapper])])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
diff --git a/src/nv_include.h b/src/nv_include.h
index eb32143..071a4a0 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -3,13 +3,18 @@
#ifndef __NV_INCLUDE_H__
#define __NV_INCLUDE_H__
+#if !USE_LIBC_WRAPPER
#include <string.h>
#include <math.h>
+#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
+#if USE_LIBC_WRAPPER
+#include "xf86_ansic.h"
+#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff --git a/src/nv_local.h b/src/nv_local.h
index 3d5d202..6cb0264 100644
--- a/src/nv_local.h
+++ b/src/nv_local.h
@@ -46,6 +46,9 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
+#if USE_LIBC_WRAPPER
+#include "xf86_ansic.h"
+#endif
#include "compiler.h"
#include "xf86_OSproc.h"
diff --git a/src/nv_video.c b/src/nv_video.c
index 33f3bb5..1a428fb 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -7,6 +7,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
+#if USE_LIBC_WRAPPER
+#include "xf86_ansic.h"
+#endif
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff --git a/src/riva_include.h b/src/riva_include.h
index 2f269df..675899b 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -3,12 +3,17 @@
#ifndef __RIVA_INCLUDE_H__
#define __RIVA_INCLUDE_H__
+#if !USE_LIBC_WRAPPER
#include <string.h>
+#endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
+#if USE_LIBC_WRAPPER
+#include "xf86_ansic.h"
+#endif
#include "compiler.h"
/* Drivers for PCI hardware need this */
diff --git a/src/riva_local.h b/src/riva_local.h
index 833ed04..bdfe2b9 100644
--- a/src/riva_local.h
+++ b/src/riva_local.h
@@ -46,6 +46,9 @@
* HW. Put all affected includes, typdefs, etc. here so the riva_hw.* files
* can stay generic in nature.
*/
+#if USE_LIBC_WRAPPER
+#include "xf86_ansic.h"
+#endif
#include "compiler.h"
#include "xf86_OSproc.h"
diff-tree 425e30d58b7b62fff01fbb58585ee69b2df6fec1 (from c34a93265cb42168376ebdf0746b3ccded9f126c)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Thu Apr 27 10:32:10 2006 -0700
Determine whether PutImage hooks take a DrawablePtr by server version. Remove
dependency on xorg-server >= 1.0.99.901.
diff --git a/ChangeLog b/ChangeLog
index d962cb9..a32ce89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-27 Aaron Plattner <aplattner at 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 at nvidia.com>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 5ac0706..8f44298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,13 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
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.
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(ScrnI
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;
More information about the xorg-commit
mailing list