Move EXA implementation up to the top level and remove its XFree86

    dependencies. It was nearly abstract enough already to be used by
    multiple DDXes. This will be useful for EXA development through
    providing a fake acceleration implementation within Xephyr, so that
    testing can be done on new EXA code without worrying about buggy
    drivers.

1 files changed, 7 insertions, 9 deletions

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 4909a0fc4..206e19fa6 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright © 2001 Keith Packard
  *
  * Partly based on code that is Copyright © The XFree86 Project Inc.
@@ -22,18 +22,17 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <xorg-config.h>
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
 #endif
+
+#include <stdlib.h>
+
 #include "exa_priv.h"
 
 #ifdef RENDER
 #include "mipict.h"
 
-#include "xf86str.h"
-#include "xf86.h"
-
-
 #if DEBUG_TRACE_FALL
 static void exaCompositeFallbackPictDesc(PicturePtr pict, char *string, int n)
 {
@@ -449,11 +448,10 @@ exaComposite(CARD8	op,
 {
     ExaScreenPriv (pDst->pDrawable->pScreen);
     int ret = -1;
-    ScrnInfoPtr pScrn = XF86SCRNINFO(pDst->pDrawable->pScreen);
     Bool saveSrcRepeat = pSrc->repeat;
     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
 
-    if (!pScrn->vtSema) {
+    if (pExaScr->swappedOut) {
         exaDrawableDirty(pDst->pDrawable);
         pExaScr->SavedComposite(op, pSrc, pMask, pDst, xSrc, ySrc,
                                 xMask, yMask, xDst, yDst, width, height);