Mesa (master): st/xorg: fix compilation of xorg_exa. c with DEBUG_PRINT set to 1
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon May 9 13:26:24 UTC 2011
Module: Mesa
Branch: master
Commit: 7c5eaf5a2de7a469dab25dc3e9ba65d74ecc9765
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c5eaf5a2de7a469dab25dc3e9ba65d74ecc9765
Author: Marcin Slusarz <marcin.slusarz at gmail.com>
Date: Mon May 9 00:36:02 2011 +0200
st/xorg: fix compilation of xorg_exa.c with DEBUG_PRINT set to 1
---
src/gallium/state_trackers/xorg/xorg_exa.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index 91c206f..fe843fe 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -584,19 +584,17 @@ ExaCheckComposite(int op,
ScrnInfoPtr pScrn = xf86Screens[pDstPicture->pDrawable->pScreen->myNum];
modesettingPtr ms = modesettingPTR(pScrn);
struct exa_context *exa = ms->exa;
+ Bool accelerated = exa->accel && 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
- if (!exa->accel)
- return FALSE;
-
- return xorg_composite_accelerated(op,
- pSrcPicture,
- pMaskPicture,
- pDstPicture);
+ return accelerated;
}
More information about the mesa-commit
mailing list