aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Slusarz <[email protected]>2011-05-09 00:36:02 +0200
committerMichel Dänzer <[email protected]>2011-05-09 12:22:24 +0200
commit7c5eaf5a2de7a469dab25dc3e9ba65d74ecc9765 (patch)
tree60d74ff0278e4a70de202e1beb98d00fae1be4e2
parent7074801ed7da5d4da71ed9fb41c4b54681f91854 (diff)
st/xorg: fix compilation of xorg_exa.c with DEBUG_PRINT set to 1
-rw-r--r--src/gallium/state_trackers/xorg/xorg_exa.c12
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 91c206f1872..fe843fe76ce 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;
}