fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-04 23:40:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Revert "st/xorg: Debug fallbacks for composite as well"

Browse source 
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 5080e8bea6.
This commit is contained in:
Jakob Bornecrantz 2009-10-08 14:41:06 +02:00
parent 5080e8bea6
commit 992b143b25
1 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/gallium/state_trackers/xorg/xorg_exa.c
View file

@ -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 *