st/xorg: fix compilation of xorg_exa.c with DEBUG_PRINT set to 1
authorMarcin Slusarz <marcin.slusarz@gmail.com>
Sun, 8 May 2011 22:36:02 +0000 (00:36 +0200)
committerMichel Dänzer <daenzer@vmware.com>
Mon, 9 May 2011 10:22:24 +0000 (12:22 +0200)
src/gallium/state_trackers/xorg/xorg_exa.c

index 91c206f1872beadd986dda55b49d756dcab4abec..fe843fe76ce42c9dca4f13b85a2b5c23a01527b1 100644 (file)
@@ -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;
 }