summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <daenzer@vmware.com>2009-02-24 08:30:23 +0100
committerMichel Dänzer <daenzer@vmware.com>2009-02-24 08:30:23 +0100
commitde358736dc696559ba99c71cf5b2a97508201630 (patch)
tree64dd7f9006f4ad831861544af3b92b15b08ad1b3 /src
parent752b0218af36a45b333a12f66dfdce8c1e662aa8 (diff)
EXA: Adapt to EXA changes in xserver Git.
The PrepareAccess hook can now get six different indices. Also remove superfluous instances of #include "exa.h". Note that you may need to run autoheader manually to get config.h.in updated.
Diffstat (limited to 'src')
-rw-r--r--src/radeon_exa.c2
-rw-r--r--src/radeon_exa_funcs.c2
-rw-r--r--src/radeon_probe.h3
3 files changed, 1 insertions, 6 deletions
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 2f36d71b..31a60c21 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -221,7 +221,7 @@ int RADEONBiggerCrtcArea(PixmapPtr pPix)
#if X_BYTE_ORDER == X_BIG_ENDIAN
-static unsigned long swapper_surfaces[3];
+static unsigned long swapper_surfaces[6];
static Bool RADEONPrepareAccess(PixmapPtr pPix, int index)
{
diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c
index eb16036c..dec02856 100644
--- a/src/radeon_exa_funcs.c
+++ b/src/radeon_exa_funcs.c
@@ -56,8 +56,6 @@
#include "radeon.h"
-#include "exa.h"
-
static int
FUNC_NAME(RADEONMarkSync)(ScreenPtr pScreen)
{
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
index 447ef573..eb2e82f6 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -43,9 +43,6 @@
#include "xf86Crtc.h"
-#ifdef USE_EXA
-#include "exa.h"
-#endif
#ifdef USE_XAA
#include "xaa.h"
#endif