Minor compilation fix

2 files changed, 40 insertions, 37 deletions

diff --git a/src/via_accel.c b/src/via_accel.c
index 1de2c53bb80d..3b485d14c2b4 100644
--- a/src/via_accel.c
+++ b/src/via_accel.c
@@ -1200,6 +1200,44 @@ viaAccelWaitMarker(ScreenPtr pScreen, int marker)
     }
 }
 
+/*
+ * Check if we need to force upload of the whole 3D state (when other
+ * clients or subsystems have touched the 3D engine). Also tell DRI
+ * clients and subsystems that we have touched the 3D engine.
+ */
+static Bool
+viaCheckUpload(ScrnInfoPtr pScrn, Via3DState * v3d)
+{
+    VIAPtr pVia = VIAPTR(pScrn);
+    Bool forceUpload;
+
+    forceUpload = (pVia->lastToUpload != v3d);
+    pVia->lastToUpload = v3d;
+
+#ifdef XF86DRI
+    if (pVia->directRenderingEnabled) {
+        volatile drm_via_sarea_t *saPriv = (drm_via_sarea_t *)
+                DRIGetSAREAPrivate(pScrn->pScreen);
+        int myContext = DRIGetContext(pScrn->pScreen);
+
+        forceUpload = forceUpload || (saPriv->ctxOwner != myContext);
+        saPriv->ctxOwner = myContext;
+    }
+#endif
+    return forceUpload;
+}
+
+static Bool
+viaOrder(CARD32 val, CARD32 * shift)
+{
+    *shift = 0;
+
+    while (val > (1 << *shift))
+        (*shift)++;
+    return (val == (1 << *shift));
+}
+
+
 #ifdef VIA_HAVE_EXA
 /*
  * Exa functions. It is assumed that EXA does not exceed the blitter limits.
@@ -1473,43 +1511,6 @@ viaExpandablePixel(int format)
             formatType == PICT_TYPE_ABGR || formatType == PICT_TYPE_ARGB);
 }
 
-/*
- * Check if we need to force upload of the whole 3D state (when other
- * clients or subsystems have touched the 3D engine). Also tell DRI
- * clients and subsystems that we have touched the 3D engine.
- */
-static Bool
-viaCheckUpload(ScrnInfoPtr pScrn, Via3DState * v3d)
-{
-    VIAPtr pVia = VIAPTR(pScrn);
-    Bool forceUpload;
-
-    forceUpload = (pVia->lastToUpload != v3d);
-    pVia->lastToUpload = v3d;
-
-#ifdef XF86DRI
-    if (pVia->directRenderingEnabled) {
-        volatile drm_via_sarea_t *saPriv = (drm_via_sarea_t *)
-                DRIGetSAREAPrivate(pScrn->pScreen);
-        int myContext = DRIGetContext(pScrn->pScreen);
-
-        forceUpload = forceUpload || (saPriv->ctxOwner != myContext);
-        saPriv->ctxOwner = myContext;
-    }
-#endif
-    return forceUpload;
-}
-
-static Bool
-viaOrder(CARD32 val, CARD32 * shift)
-{
-    *shift = 0;
-
-    while (val > (1 << *shift))
-        (*shift)++;
-    return (val == (1 << *shift));
-}
-
 #ifdef XF86DRI
 
 static int
diff --git a/src/via_memory.c b/src/via_memory.c
index 3fc7982f7e0a..553545d0377d 100644
--- a/src/via_memory.c
+++ b/src/via_memory.c
@@ -52,6 +52,7 @@
  *	2  -  DRM
  */
 
+#ifdef VIA_HAVE_EXA
 static void
 viaExaFBSave(ScreenPtr pScreen, ExaOffscreenArea * exa)
 {
@@ -60,6 +61,7 @@ viaExaFBSave(ScreenPtr pScreen, ExaOffscreenArea * exa)
                "\t\thttp://wiki.openchrome.org/tikiwiki/tiki-index"
                ".php?page=EXAAcceleration .\n");
 }
+#endif
 
 void
 VIAFreeLinear(VIAMemPtr mem)