diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-02-27 09:23:24 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-02-27 09:23:24 +0100 |
| commit | f4d57105fc869e9318f447a1514f1b284a0a4ec0 (patch) | |
| tree | 39e761443bd2f3c7ff52795c3f359e78bc90d768 | |
| parent | 3285a4af17b19f2d1c24eebfb6aa51cddcf3ca50 (diff) | |
Revert "EXA: Adapt to EXA changes in xserver Git."
This reverts commit de358736dc696559ba99c71cf5b2a97508201630.
| -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, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 28207d6f..b094a50a 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 -DEXA_DRIVER_KNOWN_MAJOR=3" + CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 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 -DEXA_DRIVER_KNOWN_MAJOR=3" +CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" 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,7 +153,6 @@ 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 ae681462..c5943de1 100644 --- a/src/radeon_exa.c +++ b/src/radeon_exa.c @@ -222,7 +222,7 @@ int RADEONBiggerCrtcArea(PixmapPtr pPix) #if X_BYTE_ORDER == X_BIG_ENDIAN -static unsigned long swapper_surfaces[6]; +static unsigned long swapper_surfaces[3]; static Bool RADEONPrepareAccess(PixmapPtr pPix, int index) { diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c index dec02856..eb16036c 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -56,6 +56,8 @@ #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 49044e36..f072b9c7 100644 --- a/src/radeon_probe.h +++ b/src/radeon_probe.h @@ -43,6 +43,9 @@ #include "xf86Crtc.h" +#ifdef USE_EXA +#include "exa.h" +#endif #ifdef USE_XAA #include "xaa.h" #endif |