diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
| commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
| tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/randr | |
| parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
| download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip | |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/randr')
| -rw-r--r-- | xorg-server/randr/randrstr.h | 2 | ||||
| -rw-r--r-- | xorg-server/randr/rrinfo.c | 2 | ||||
| -rw-r--r-- | xorg-server/randr/rrscreen.c | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h index 975fe3396..b163a73da 100644 --- a/xorg-server/randr/randrstr.h +++ b/xorg-server/randr/randrstr.h @@ -47,10 +47,8 @@ #include "rrtransform.h" #include <X11/extensions/randr.h> #include <X11/extensions/randrproto.h> -#ifdef RENDER #include <X11/extensions/render.h> /* we share subpixel order information */ #include "picturestr.h" -#endif #include <X11/Xfuncproto.h> /* required for ABI compatibility for now */ diff --git a/xorg-server/randr/rrinfo.c b/xorg-server/randr/rrinfo.c index 12b9a4aab..20066d5fc 100644 --- a/xorg-server/randr/rrinfo.c +++ b/xorg-server/randr/rrinfo.c @@ -99,9 +99,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations) return; RROutputSetCrtcs (output, &crtc, 1); RROutputSetConnection (output, RR_Connected); -#ifdef RENDER RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen)); -#endif } output = pScrPriv->outputs[0]; diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c index e88a42816..45e6ed724 100644 --- a/xorg-server/randr/rrscreen.c +++ b/xorg-server/randr/rrscreen.c @@ -111,11 +111,7 @@ RRDeliverScreenEvent (ClientPtr client, WindowPtr pWin, ScreenPtr pScreen) se.configTimestamp = pScrPriv->lastConfigTime.milliseconds; se.root = pRoot->drawable.id; se.window = pWin->drawable.id; -#ifdef RENDER se.subpixelOrder = PictureGetSubpixelOrder (pScreen); -#else - se.subpixelOrder = SubPixelUnknown; -#endif se.sequenceNumber = client->sequence; se.sizeID = RR10CurrentSizeID (pScreen); |