summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2009-02-25 13:00:12 -0500
committerChris Ball <cjb@laptop.org>2009-02-25 13:00:12 -0500
commitb951fe81bb976704be716251a4925086f2c70013 (patch)
treed98ff04edb201f86d64a65dc222762f5ad65ded7
parent4152c64a22e81a8f2e2d91507493c422aac301a3 (diff)
Build fix: set EXA_DRIVER_KNOWN_MAJOR=3
EXA in server HEAD requires this now. Since this driver doesn't use {Prepare,Finish}Access or UploadToScratch, the change is safe. Remove unused {Prepare,Finish}Access empty functions. Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--configure.ac3
-rw-r--r--src/blade_accel_exa.c8
2 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index 60aa953..95dc448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,9 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+# Required by exa.h
+AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we can handle])
+
# Checks for libraries.
# Checks for header files.
diff --git a/src/blade_accel_exa.c b/src/blade_accel_exa.c
index 80e3f23..3129623 100644
--- a/src/blade_accel_exa.c
+++ b/src/blade_accel_exa.c
@@ -251,14 +251,6 @@ static void WaitMarker(ScreenPtr pScreen, int marker)
}
}
-static Bool PrepareAccess(PixmapPtr pPix, int index)
-{
-}
-
-static void FinishAccess(PixmapPtr pPix, int index)
-{
-}
-
static void BladeInitializeAccelerator(ScrnInfoPtr pScrn)
{
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);