Module: Mesa Branch: master Commit: 992b143b2551b0fe1871bc90aed984f63d04d7b5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=992b143b2551b0fe1871bc90aed984f63d04d7b5
Author: Jakob Bornecrantz <[email protected]> Date: Thu Oct 8 14:41:06 2009 +0200 Revert "st/xorg: Debug fallbacks for composite as well" This commit included a change that should have been in its own commit, and turns out that you can do what was suposed to go in it in much better way as well. This reverts commit 5080e8bea6ae5cdb116023a5e2d8dbbb762bd69d. --- src/gallium/state_trackers/xorg/xorg_exa.c | 44 ++++++++++----------------- 1 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c index 279b551..8920b24 100644 --- a/src/gallium/state_trackers/xorg/xorg_exa.c +++ b/src/gallium/state_trackers/xorg/xorg_exa.c @@ -215,12 +215,8 @@ ExaPrepareAccess(PixmapPtr pPix, int index) #endif PIPE_TRANSFER_READ_WRITE, 0, 0, priv->tex->width[0], priv->tex->height[0]); - if (!priv->map_transfer) -#ifdef EXA_MIXED_PIXMAPS + if (!priv->map_transfer) return FALSE; -#else - FatalError("failed to create transfer\n"); -#endif pPix->devPrivate.ptr = exa->scrn->transfer_map(exa->scrn, priv->map_transfer); @@ -322,10 +318,7 @@ ExaPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planeMask, Pixel fg) #if DISABLE_ACCEL return FALSE; #else - if (xorg_solid_bind_state(exa, priv, fg)) - return TRUE; - else - XORG_FALLBACK("xorg_solid_bind_state failed\n"); + return xorg_solid_bind_state(exa, priv, fg); #endif } @@ -503,14 +496,11 @@ ExaPrepareComposite(int op, PicturePtr pSrcPicture, (void) exa; return FALSE; #else - if (xorg_composite_bind_state(exa, op, pSrcPicture, pMaskPicture, - pDstPicture, - pSrc ? exaGetPixmapDriverPrivate(pSrc) : NULL, - pMask ? exaGetPixmapDriverPrivate(pMask) : NULL, - exaGetPixmapDriverPrivate(pDst))) - return TRUE; - else - XORG_FALLBACK("xorg_composite_bind_state failed"); + return xorg_composite_bind_state(exa, op, pSrcPicture, pMaskPicture, + pDstPicture, + pSrc ? exaGetPixmapDriverPrivate(pSrc) : NULL, + pMask ? exaGetPixmapDriverPrivate(pMask) : NULL, + exaGetPixmapDriverPrivate(pDst)); #endif } @@ -536,17 +526,15 @@ ExaCheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskPicture, PicturePtr pDstPicture) { - ScreenPtr pScreen = pDstPicture->pDrawable->pScreen; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - modesettingPtr ms = modesettingPTR(pScrn); - - if (xorg_composite_accelerated(op, - pSrcPicture, - pMaskPicture, - pDstPicture)) - return TRUE; - else - XORG_FALLBACK("xorg_composite_accelerated failed"); + boolean accelerated = xorg_composite_accelerated(op, + pSrcPicture, + pMaskPicture, + pDstPicture); +#if DEBUG_PRINT + debug_printf("ExaCheckComposite(%d, %p, %p, %p) = %d\n", + op, pSrcPicture, pMaskPicture, pDstPicture, accelerated); +#endif + return accelerated; } static void * _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
