diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-21 15:55:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 17:06:00 -0700 |
| commit | c231b41f3f3eb3ba9c8436d5fd93a30704ed437c (patch) | |
| tree | ec3a1314ddaf88d393effd5b88021442839d5d72 | |
| parent | e5133a94dc78411eaef324131ea8056aeb81779e (diff) | |
Remove checks for xf86RotateFreeShadow, introduced in server 1.4.
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/i830_driver.c | 18 |
2 files changed, 0 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac index 768f39dd..12fec794 100644 --- a/configure.ac +++ b/configure.ac @@ -119,18 +119,6 @@ AC_MSG_RESULT([$DRI]) PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10]) -SAVE_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XORG_CFLAGS" - -AC_CHECK_DECL(xf86RotateFreeShadow, - [AC_DEFINE(HAVE_FREE_SHADOW, 1, [have new FreeShadow API])], - [], - [#include <xorg-server.h> - #include <windowstr.h> - #include <xf86Crtc.h>]) - -CPPFLAGS="$SAVE_CPPFLAGS" - dnl Use lots of warning flags with GCC WARN_CFLAGS="" diff --git a/src/i830_driver.c b/src/i830_driver.c index 3642205c..7a81d933 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2969,10 +2969,6 @@ I830LeaveVT(int scrnIndex, int flags) ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); int ret; -#ifndef HAVE_FREE_SHADOW - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - int o; -#endif DPRINTF(PFX, "Leave VT\n"); @@ -2984,21 +2980,7 @@ I830LeaveVT(int scrnIndex, int flags) i830SetHotkeyControl(pScrn, HOTKEY_BIOS_SWITCH); - -#ifndef HAVE_FREE_SHADOW - for (o = 0; o < config->num_crtc; o++) { - xf86CrtcPtr crtc = config->crtc[o]; - - if (crtc->rotatedPixmap || crtc->rotatedData) { - crtc->funcs->shadow_destroy(crtc, crtc->rotatedPixmap, - crtc->rotatedData); - crtc->rotatedPixmap = NULL; - crtc->rotatedData = NULL; - } - } -#else xf86RotateFreeShadow(pScrn); -#endif xf86_hide_cursors (pScrn); |