diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-25 08:27:07 +0000 |
| commit | 27b0ed125725f09242054563bb65ac20cfaa17ff (patch) | |
| tree | 6fe92374761ae87d8541d117605db27f3486aee1 /xorg-server/randr/randr.c | |
| parent | e8d899178e9ebe174e6b4a53297d3dfced8003f0 (diff) | |
| parent | 8268836508edd4ba2a3045c9ba937397df7bf2c5 (diff) | |
| download | vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.gz vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.tar.bz2 vcxsrv-27b0ed125725f09242054563bb65ac20cfaa17ff.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/randr/randr.c')
| -rw-r--r-- | xorg-server/randr/randr.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/xorg-server/randr/randr.c b/xorg-server/randr/randr.c index 1346d1e9c..aa1e71dcf 100644 --- a/xorg-server/randr/randr.c +++ b/xorg-server/randr/randr.c @@ -98,7 +98,6 @@ RRCloseScreen (int i, ScreenPtr pScreen) free(pScrPriv->crtcs);
free(pScrPriv->outputs);
- free(pScrPriv->scanout_info);
free(pScrPriv);
RRNScreens -= 1; /* ok, one fewer screen with RandR running */
return (*pScreen->CloseScreen) (i, pScreen);
@@ -249,8 +248,6 @@ Bool RRScreenInit(ScreenPtr pScreen) pScrPriv->rrCrtcSet = NULL;
pScrPriv->rrCrtcSetGamma = NULL;
#endif
- pScrPriv->scanout_info = NULL;
- pScrPriv->n_scanout_info = 0;
#if RANDR_10_INTERFACE
pScrPriv->rrSetConfig = 0;
pScrPriv->rotations = RR_Rotate_0;
@@ -485,18 +482,6 @@ RRVerticalRefresh (xRRModeInfo *mode) return (CARD16) refresh;
}
-RRScanoutPixmapInfo *
-RRQueryScanoutPixmapInfo(ScreenPtr screen, int *n_info)
-{
- rrScrPriv(screen);
-
- if (!pScrPriv->scanout_info && pScrPriv->rrQueryScanoutPixmaps)
- pScrPriv->scanout_info = pScrPriv->rrQueryScanoutPixmaps(screen,
- &pScrPriv->n_scanout_info);
- *n_info = pScrPriv->n_scanout_info;
- return pScrPriv->scanout_info;
-}
-
static int
ProcRRDispatch (ClientPtr client)
{
|