diff options
author | Zack Rusin <[email protected]> | 2009-09-23 12:06:13 -0400 |
---|---|---|
committer | Zack Rusin <[email protected]> | 2009-09-24 19:20:41 -0400 |
commit | 80965fca743c3101af731080cb81dec705cd931b (patch) | |
tree | 2bb6b5da9bd2301f24c6c2483d379533eb4a37f1 | |
parent | 53d2fa46e7fa19d0cb7dec74efcd407ab6163c80 (diff) |
st/xorg: fills are supported plussome minor clenups
-rw-r--r-- | src/gallium/state_trackers/xorg/xorg_composite.c | 7 | ||||
-rw-r--r-- | 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 bb50289ac6b..f8a3d7ba8aa 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 deae9d80fdf..1bb274e6bdd 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 * |