diff options
author | Keith Packard <keithp@neko.keithp.com> | 2006-10-25 09:48:23 -0700 |
---|---|---|
committer | Keith Packard <keithp@neko.keithp.com> | 2006-10-25 09:48:23 -0700 |
commit | e21604914dccece6bc64c69b55512d1f1a969235 (patch) | |
tree | 82cae2b1cc1df0931e9ca42e978cc504027c41af /randr/mirandr.c | |
parent | 59511974db843fa7e11133894cfc10c20fdaf60f (diff) |
Merge master back in and clean up some unfinished code (closes 8745)
Diffstat (limited to 'randr/mirandr.c')
-rw-r--r-- | randr/mirandr.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/randr/mirandr.c b/randr/mirandr.c index fab0fd1bd..8d79e8a11 100644 --- a/randr/mirandr.c +++ b/randr/mirandr.c @@ -57,6 +57,21 @@ miRRCrtcSet (ScreenPtr pScreen, return TRUE; } +static Bool +miRRCrtcSetGamma (ScreenPtr pScreen, + RRCrtcPtr crtc) +{ + return TRUE; +} + +static Bool +miRROutputSetProperty (ScreenPtr pScreen, + RROutputPtr output, + Atom property) +{ + return TRUE; +} + /* * This function assumes that only a single depth can be * displayed at a time, but that all visuals of that depth @@ -85,7 +100,7 @@ miRandRInit (ScreenPtr pScreen) #if RANDR_12_INTERFACE pScrPriv->rrCrtcSet = miRRCrtcSet; pScrPriv->rrCrtcSetGamma = miRRCrtcSetGamma; - pScrPriv->rrOutputSetProperty = miRROutput + pScrPriv->rrOutputSetProperty = miRROutputSetProperty; RRScreenSetSizeRange (pScreen, |