summaryrefslogtreecommitdiff
path: root/hw/xprint
diff options
context:
space:
mode:
authorAdam Jackson <ajax@benzedrine.nwnk.net>2007-08-25 15:08:20 -0400
committerAdam Jackson <ajax@benzedrine.nwnk.net>2007-08-25 15:08:20 -0400
commitae7f71a8b3d6756161e55d998d6eec37d2695c98 (patch)
tree062e2a706da974db9e40c0fabf25c32355a26916 /hw/xprint
parentbf0883ae5081bd75569115a3eb27c6d3d336c9f2 (diff)
Implement core protocol backing store exclusively in terms of Composite.
Composite's automatic redirection is a more general mechanism than the ad-hoc BS machinery, so it's much prettier to implement the one in terms of the other. Composite now wraps ChangeWindowAttributes and activates automatic redirection for windows with backing store requested. The old backing store infrastructure is completely gutted: ABI-visible structures retain the function pointers, but they never get called, and all the open-coded conditionals throughout the DIX layer to implement BS are gone. Note that this is still not a strictly complete implementation of backing store, since Composite will throw the bits away on unmap and therefore WhenMapped and Always hints are equivalent.
Diffstat (limited to 'hw/xprint')
-rw-r--r--hw/xprint/pcl/PclWindow.c16
-rw-r--r--hw/xprint/ps/PsWindow.c14
2 files changed, 0 insertions, 30 deletions
diff --git a/hw/xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c
index adf03da8d..80f4e91b1 100644
--- a/hw/xprint/pcl/PclWindow.c
+++ b/hw/xprint/pcl/PclWindow.c
@@ -333,14 +333,6 @@ PclPaintWindow(
newValues[ABSY] = (pointer)0;
}
-/*
- * XXX Backing store is turned off for the PCL driver
-
- if (pWin->backStorage)
- (*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC,
- GuaranteeVisBack);
- */
-
mask = gcmask;
gcmask = 0;
i = 0;
@@ -420,14 +412,6 @@ PclPaintWindow(
(*pGC->ops->PolyFillRect)((DrawablePtr)pWin, pGC, numRects, prect);
DEALLOCATE_LOCAL(prect);
-/*
- * XXX Backing store is turned off for the PCL driver
-
- if (pWin->backStorage)
- (*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC,
- GuaranteeNothing);
- */
-
if (what == PW_BORDER)
{
REGION_UNINIT(pScreen, &pWin->clipList);
diff --git a/hw/xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c
index 1317fd704..26075a80a 100644
--- a/hw/xprint/ps/PsWindow.c
+++ b/hw/xprint/ps/PsWindow.c
@@ -340,13 +340,6 @@ PsPaintWindow(
newValues[ABSY] = (pointer)0;
}
-/*
- * XXX Backing store is turned off for the PS driver
-
- if( pWin->backStorage )
- (*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC, GuaranteeVisBack);
- */
-
mask = gcmask;
gcmask = 0;
i = 0;
@@ -433,13 +426,6 @@ PsPaintWindow(
(*pGC->ops->PolyFillRect)((DrawablePtr)pWin, pGC, numRects, prect);
DEALLOCATE_LOCAL(prect);
-/*
- * XXX Backing store is turned off for the PS driver
-
- if( pWin->backStorage )
- (*pWin->drawable.pScreen->DrawGuarantee) (pWin, pGC, GuaranteeNothing);
- */
-
if( what==PW_BORDER )
{
REGION_UNINIT(pScreen, &pWin->clipList);