diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-11-05 09:58:17 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-12-09 13:20:36 -0500 |
| commit | e0cac005608a2e5618c7be59701318d684e0bb93 (patch) | |
| tree | d480b6bf7791e5755444407e1b41231f27df91f2 | |
| parent | b61ccd5d9d368f3fbbae27ce14ac02a3db1884c4 (diff) | |
bs: Set the screen's bs support level to WhenMapped
Since we're using RedirectAutomatic to do this, we don't actually
preserve contents when unmapped.
v2: Don't say WhenMapped if Composite didn't initialize [vsyrjala]
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | dix/window.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dix/window.c b/dix/window.c index 92df1eb4c..0e9109e89 100644 --- a/dix/window.c +++ b/dix/window.c @@ -530,7 +530,11 @@ CreateRootWindow(ScreenPtr pScreen) if (disableBackingStore) pScreen->backingStoreSupport = NotUseful; if (enableBackingStore) - pScreen->backingStoreSupport = Always; + pScreen->backingStoreSupport = WhenMapped; +#ifdef COMPOSITE + if (noCompositeExtension) + pScreen->backingStoreSupport = NotUseful; +#endif pScreen->saveUnderSupport = NotUseful; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 721159d0b..4f1f3d4c3 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1640,7 +1640,7 @@ xf86SetBackingStore(ScreenPtr pScreen) from = X_CONFIG; } free(options); - pScreen->backingStoreSupport = useBS ? Always : NotUseful; + pScreen->backingStoreSupport = useBS ? WhenMapped : NotUseful; if (serverGeneration == 1) xf86DrvMsg(pScreen->myNum, from, "Backing store %s\n", useBS ? "enabled" : "disabled"); |