Mesa (master): st/xorg: fills are supported plussome minor clenups

[Zack Rusin]

Module: Mesa
Branch: master
Commit: 80965fca743c3101af731080cb81dec705cd931b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80965fca743c3101af731080cb81dec705cd931b

Author: Zack Rusin <zackr at vmware.com>
Date:   Wed Sep 23 12:06:13 2009 -0400

st/xorg: fills are supported plussome minor clenups

---

 src/gallium/state_trackers/xorg/xorg_composite.c |    7 -------
 src/gallium/state_trackers/xorg/xorg_exa.c       |   11 +++++++----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index bb50289..f8a3d7b 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -305,17 +305,10 @@ boolean xorg_composite_accelerated(int op,
    unsigned accel_ops_count =
       sizeof(accelerated_ops)/sizeof(struct acceleration_info);
 
-
-   /*FIXME: currently accel is disabled */
-   return FALSE;
-
    if (pSrcPicture) {
       /* component alpha not supported */
       if (pSrcPicture->componentAlpha)
          return FALSE;
-      /* fills not supported */
-      if (pSrcPicture->pSourcePict)
-         return FALSE;
    }
 
    for (i = 0; i < accel_ops_count; ++i) {
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index deae9d8..1bb274e 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -473,10 +473,13 @@ ExaCheckComposite(int op,
 		  PicturePtr pSrcPicture, PicturePtr pMaskPicture,
 		  PicturePtr pDstPicture)
 {
-   return xorg_composite_accelerated(op,
-                                     pSrcPicture,
-                                     pMaskPicture,
-                                     pDstPicture);
+   boolean accelerated = xorg_composite_accelerated(op,
+                                                    pSrcPicture,
+                                                    pMaskPicture,
+                                                    pDstPicture);
+   debug_printf("ExaCheckComposite(%d, %p, %p, %p) = %d\n",
+                op, pSrcPicture, pMaskPicture, pDstPicture, accelerated);
+   return accelerated;
 }
 
 static void *