diff options
Diffstat (limited to 'xorg/server/module/rdpComposite.c')
| -rw-r--r-- | xorg/server/module/rdpComposite.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xorg/server/module/rdpComposite.c b/xorg/server/module/rdpComposite.c index a2c5568e..8776335b 100644 --- a/xorg/server/module/rdpComposite.c +++ b/xorg/server/module/rdpComposite.c @@ -36,6 +36,7 @@ composite(alpha blending) calls #include "rdp.h" #include "rdpComposite.h" +#include "rdpDraw.h" /******************************************************************************/ #define LOG_LEVEL 1 @@ -46,8 +47,8 @@ composite(alpha blending) calls static void rdpCompositeOrg(PictureScreenPtr ps, rdpPtr dev, CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, - INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, INT16 xDst, - INT16 yDst, CARD16 width, CARD16 height) + INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask, + INT16 xDst, INT16 yDst, CARD16 width, CARD16 height) { ps->Composite = dev->Composite; ps->Composite(op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, @@ -63,14 +64,12 @@ rdpComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, { ScreenPtr pScreen; rdpPtr dev; - ScrnInfoPtr pScrn; PictureScreenPtr ps; LLOGLN(10, ("rdpComposite:")); pScreen = pSrc->pDrawable->pScreen; - pScrn = xf86Screens[pScreen->myNum]; - dev = XRDPPTR(pScrn); + dev = rdpGetDevFromScreen(pScreen); ps = GetPictureScreen(pScreen); - rdpCompositeOrg(ps, dev, op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask, - xDst, yDst, width, height); + rdpCompositeOrg(ps, dev, op, pSrc, pMask, pDst, xSrc, ySrc, + xMask, yMask, xDst, yDst, width, height); } |