diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-07-31 00:41:44 -0700 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-07-31 00:41:44 -0700 |
| commit | 61d51cea601e9c0daf74f404d939aeeaf678c1b1 (patch) | |
| tree | 848bdbae66561807da4d57a72a2735f667577df3 /xorg/server/module/rdpPixmap.c | |
| parent | 2515caa66a37409f32bbfff552bb370b43f9701a (diff) | |
| download | xrdp-proprietary-61d51cea601e9c0daf74f404d939aeeaf678c1b1.tar.gz xrdp-proprietary-61d51cea601e9c0daf74f404d939aeeaf678c1b1.zip | |
xorg driver, PROLOGUE / EPILOGUE changes
Diffstat (limited to 'xorg/server/module/rdpPixmap.c')
| -rw-r--r-- | xorg/server/module/rdpPixmap.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/xorg/server/module/rdpPixmap.c b/xorg/server/module/rdpPixmap.c index 191bb9e9..08b76735 100644 --- a/xorg/server/module/rdpPixmap.c +++ b/xorg/server/module/rdpPixmap.c @@ -33,6 +33,7 @@ pixmap calls #include <xf86_OSproc.h> #include "rdp.h" +#include "rdpDraw.h" /******************************************************************************/ #define LOG_LEVEL 1 @@ -44,14 +45,12 @@ PixmapPtr rdpCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, unsigned usage_hint) { - ScrnInfoPtr pScrn; rdpPtr dev; PixmapPtr rv; LLOGLN(10, ("rdpCreatePixmap: width %d height %d depth %d", width, height, depth)); - pScrn = xf86Screens[pScreen->myNum]; - dev = XRDPPTR(pScrn); + dev = rdpGetDevFromScreen(pScreen); pScreen->CreatePixmap = dev->CreatePixmap; rv = pScreen->CreatePixmap(pScreen, width, height, depth, usage_hint); pScreen->CreatePixmap = rdpCreatePixmap; @@ -65,12 +64,10 @@ rdpDestroyPixmap(PixmapPtr pPixmap) Bool rv; ScreenPtr pScreen; rdpPtr dev; - ScrnInfoPtr pScrn; LLOGLN(10, ("rdpDestroyPixmap: refcnt %d", pPixmap->refcnt)); pScreen = pPixmap->drawable.pScreen; - pScrn = xf86Screens[pScreen->myNum]; - dev = XRDPPTR(pScrn); + dev = rdpGetDevFromScreen(pScreen); pScreen->DestroyPixmap = dev->DestroyPixmap; rv = pScreen->DestroyPixmap(pPixmap); pScreen->DestroyPixmap = rdpDestroyPixmap; @@ -85,12 +82,10 @@ rdpModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, Bool rv; ScreenPtr pScreen; rdpPtr dev; - ScrnInfoPtr pScrn; LLOGLN(10, ("rdpModifyPixmapHeader:")); pScreen = pPixmap->drawable.pScreen; - pScrn = xf86Screens[pScreen->myNum]; - dev = XRDPPTR(pScrn); + dev = rdpGetDevFromScreen(pScreen); pScreen->ModifyPixmapHeader = dev->ModifyPixmapHeader; rv = pScreen->ModifyPixmapHeader(pPixmap, width, height, depth, bitsPerPixel, devKind, pPixData); |