diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-11-05 10:08:17 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2013-12-09 13:20:36 -0500 |
| commit | a2b2c271e0ca87d3188ba2741b6db9bbbdc599f5 (patch) | |
| tree | 21fdcec9f9ef68b16189c7fa67fa21b19f867f84 | |
| parent | e0cac005608a2e5618c7be59701318d684e0bb93 (diff) | |
composite: Automatically enable backing store support on the screen
... unless you explicitly disabled it with -bs on the command line, or
with the corresponding thing in xorg.conf.
v2: Drop a bogus hunk from compChangeWindowAttributes [vsyrjala]
v3: s/TRUE/WhenMapped/ [jcristau]
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | composite/compinit.c | 3 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86Helper.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/composite/compinit.c b/composite/compinit.c index bc1130e78..64314640f 100644 --- a/composite/compinit.c +++ b/composite/compinit.c @@ -355,6 +355,9 @@ compScreenInit(ScreenPtr pScreen) return FALSE; } + if (!disableBackingStore) + pScreen->backingStoreSupport = WhenMapped; + cs->PositionWindow = pScreen->PositionWindow; pScreen->PositionWindow = compPositionWindow; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 4f1f3d4c3..f1e6783a7 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1638,6 +1638,11 @@ xf86SetBackingStore(ScreenPtr pScreen) else { if (xf86GetOptValBool(options, OPTION_BACKING_STORE, &useBS)) from = X_CONFIG; +#ifdef COMPOSITE + if (from != X_CONFIG) + useBS = xf86ReturnOptValBool(options, OPTION_BACKING_STORE, + !noCompositeExtension); +#endif } free(options); pScreen->backingStoreSupport = useBS ? WhenMapped : NotUseful; |