diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-02-24 08:30:23 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-02-24 08:30:23 +0100 |
| commit | de358736dc696559ba99c71cf5b2a97508201630 (patch) | |
| tree | 64dd7f9006f4ad831861544af3b92b15b08ad1b3 | |
| parent | 752b0218af36a45b333a12f66dfdce8c1e662aa8 (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.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/radeon_exa.c | 2 | ||||
| -rw-r--r-- | src/radeon_exa_funcs.c | 2 | ||||
| -rw-r--r-- | src/radeon_probe.h | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index b094a50a..28207d6f 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,7 @@ if test "x$EXA" = xyes; then AC_MSG_RESULT(yes) SAVE_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" + CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3" AC_CHECK_HEADER(exa.h, [have_exa_h="yes"], [have_exa_h="no"]) CPPFLAGS="$SAVE_CPPFLAGS" @@ -138,7 +138,7 @@ else fi SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS -DEXA_DRIVER_KNOWN_MAJOR=3" if test "x$have_exa_h" = xyes; then AC_MSG_CHECKING([whether EXA version is at least 2.0.0]) AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ @@ -153,6 +153,7 @@ if test "x$have_exa_h" = xyes; then if test "x$USE_EXA" = xyes; then AC_DEFINE(USE_EXA, 1, [Build support for Exa]) + AC_DEFINE(EXA_DRIVER_KNOWN_MAJOR, 3, [Major version of EXA we know how to handle]) fi fi 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 |